AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #309 from lioncash/constexpr8 

CMorphBall: Make use of constexpr on file-scope arrays
This commit is contained in:
Luke Street 2020-04-12 03:06:59 -04:00 committed by GitHub
parent 56cebfbacd fef6711ce8
commit 32134990c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CMorphBall.cpp
View File

@ -204,7 +204,7 @@ constexpr std::array<CMorphBall::ColorArray, 9> BallSwooshColorsJaggy{{
}};
} // Anonymous namespace
const std::array<CMorphBall::ColorArray, 9> CMorphBall::BallGlowColors{{
constexpr std::array<CMorphBall::ColorArray, 9> CMorphBall::BallGlowColors{{
{0xff, 0xff, 0xff},
{0xff, 0xff, 0xff},
{0xff, 0xff, 0xff},
@ -216,7 +216,7 @@ const std::array<CMorphBall::ColorArray, 9> CMorphBall::BallGlowColors{{
{0xff, 0xff, 0xff},
}};
const std::array<CMorphBall::ColorArray, 9> CMorphBall::BallTransFlashColors{{
constexpr std::array<CMorphBall::ColorArray, 9> CMorphBall::BallTransFlashColors{{
{0xc2, 0x7e, 0x10},
{0x66, 0xc4, 0xff},
{0x60, 0xff, 0x90},
@ -228,7 +228,7 @@ const std::array<CMorphBall::ColorArray, 9> CMorphBall::BallTransFlashColors{{
{0xfb, 0x98, 0x21},
}};
const std::array<CMorphBall::ColorArray, 9> CMorphBall::BallAuxGlowColors{{
constexpr std::array<CMorphBall::ColorArray, 9> CMorphBall::BallAuxGlowColors{{
{0xc2, 0x7e, 0x10},
{0x66, 0xc4, 0xff},
{0x6c, 0xff, 0x61},