AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-05 07:55:52 +00:00
Code Issues Projects Releases Wiki Activity

CSamusDoll: Mark skInitialOffset as constexpr

Browse Source 
Allows the vector to be initialized at compile-time.
This commit is contained in:
Lioncash 2020-02-24 01:34:56 -05:00
parent 61f9adfa70
commit 08ebecdaaf
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/CSamusDoll.cpp
View File

@ -17,8 +17,6 @@
namespace urde::MP1 { namespace urde::MP1 {
const zeus::CVector3f CSamusDoll::skInitialOffset = {0.f, 0.f, 0.8f};
static const std::pair<const char*, u32> SpiderBallGlassModels[] = { static const std::pair<const char*, u32> SpiderBallGlassModels[] = {
{"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 1}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 1},
{"SamusPhazonBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusPhazonBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0},

2
Runtime/MP1/CSamusDoll.hpp
View File

@ -85,7 +85,7 @@ class CSamusDoll {
u32 _dummy = 0; u32 _dummy = 0;
}; };
static const zeus::CVector3f skInitialOffset; static constexpr zeus::CVector3f skInitialOffset{0.0f, 0.0f, 0.8f};
static CModelData BuildSuitModelData1(CPlayerState::EPlayerSuit suit); static CModelData BuildSuitModelData1(CPlayerState::EPlayerSuit suit);
static CModelData BuildSuitModelDataBoots(CPlayerState::EPlayerSuit suit); static CModelData BuildSuitModelDataBoots(CPlayerState::EPlayerSuit suit);
void SetupLights(); void SetupLights();