From fef6711ce827e50fa54f189a10f964852740912a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 11 Apr 2020 20:41:49 -0400 Subject: [PATCH] CMorphBall: Make use of constexpr on file-scope arrays Same behavior, but allows elision of runtime initializers. --- Runtime/World/CMorphBall.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp index d00d29429..256b70c96 100644 --- a/Runtime/World/CMorphBall.cpp +++ b/Runtime/World/CMorphBall.cpp @@ -204,7 +204,7 @@ constexpr std::array BallSwooshColorsJaggy{{ }}; } // Anonymous namespace -const std::array CMorphBall::BallGlowColors{{ +constexpr std::array CMorphBall::BallGlowColors{{ {0xff, 0xff, 0xff}, {0xff, 0xff, 0xff}, {0xff, 0xff, 0xff}, @@ -216,7 +216,7 @@ const std::array CMorphBall::BallGlowColors{{ {0xff, 0xff, 0xff}, }}; -const std::array CMorphBall::BallTransFlashColors{{ +constexpr std::array CMorphBall::BallTransFlashColors{{ {0xc2, 0x7e, 0x10}, {0x66, 0xc4, 0xff}, {0x60, 0xff, 0x90}, @@ -228,7 +228,7 @@ const std::array CMorphBall::BallTransFlashColors{{ {0xfb, 0x98, 0x21}, }}; -const std::array CMorphBall::BallAuxGlowColors{{ +constexpr std::array CMorphBall::BallAuxGlowColors{{ {0xc2, 0x7e, 0x10}, {0x66, 0xc4, 0xff}, {0x6c, 0xff, 0x61},