From 26b24d604a2c76dfd0466fcce9099e24995b8532 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 21 Oct 2019 18:59:51 -0400 Subject: [PATCH] CArtifactDoll: Make use of an anonymous namespace Provides a unified section to place internally linked data. --- Runtime/MP1/CArtifactDoll.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Runtime/MP1/CArtifactDoll.cpp b/Runtime/MP1/CArtifactDoll.cpp index 213cdab61..a58d2725a 100644 --- a/Runtime/MP1/CArtifactDoll.cpp +++ b/Runtime/MP1/CArtifactDoll.cpp @@ -13,8 +13,8 @@ #include namespace urde::MP1 { - -static const char* ArtifactPieceModels[] = { +namespace { +constexpr const char* ArtifactPieceModels[] = { "CMDL_Piece1", // Truth "CMDL_Piece2", // Strength "CMDL_Piece3", // Elder @@ -29,7 +29,7 @@ static const char* ArtifactPieceModels[] = { "CMDL_Piece12" // Newborn }; -static const CAssetId ArtifactHeadScans[] = { +constexpr CAssetId ArtifactHeadScans[] = { 0x32C9DDCE, // Truth 0xB45DAF60, // Strength 0x7F017CC5, // Elder @@ -44,8 +44,9 @@ static const CAssetId ArtifactHeadScans[] = { 0xB6763C91 // Newborn }; -static const zeus::CColor ArtifactPreColor = {0.4f, 0.68f, 0.88f, 0.8f}; -static const zeus::CColor ArtifactPostColor = {1.f, 0.63f, 0.02f, 1.f}; +constexpr zeus::CColor ArtifactPreColor{0.4f, 0.68f, 0.88f, 0.8f}; +constexpr zeus::CColor ArtifactPostColor{1.f, 0.63f, 0.02f, 1.f}; +} // Anonymous namespace CArtifactDoll::CArtifactDoll() { x10_lights.resize(2, CLight::BuildDirectional(zeus::skForward, zeus::skWhite));