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

CSamusDoll: Make use of an anonymous namespace 

Makes a separate area for internally linked data.
This commit is contained in:
Lioncash 2020-02-24 01:37:41 -05:00
parent 08ebecdaaf
commit 61dff4367d
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Runtime/MP1/CSamusDoll.cpp
View File

@ -16,44 +16,57 @@
#include <zeus/CEulerAngles.hpp> #include <zeus/CEulerAngles.hpp>
namespace urde::MP1 { namespace urde::MP1 {
namespace {
static const std::pair<const char*, u32> SpiderBallGlassModels[] = { 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},
{"SamusSpiderBallGlassCMDL", 1}, {"SamusPhazonBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 1}, {"SamusPhazonBallGlassCMDL", 0},
}; };
static const std::pair<const char*, u32> SpiderBallCharacters[] = { const std::pair<const char*, u32> SpiderBallCharacters[] = {
{"SamusSpiderBallANCS", 0}, {"SamusSpiderBallANCS", 0}, {"SamusSpiderBallANCS", 1}, {"SamusPhazonBallANCS", 0}, {"SamusSpiderBallANCS", 0}, {"SamusSpiderBallANCS", 0}, {"SamusSpiderBallANCS", 1}, {"SamusPhazonBallANCS", 0},
{"SamusFusionBallANCS", 0}, {"SamusFusionBallANCS", 2}, {"SamusFusionBallANCS", 1}, {"SamusFusionBallANCS", 3}, {"SamusFusionBallANCS", 0}, {"SamusFusionBallANCS", 2}, {"SamusFusionBallANCS", 1}, {"SamusFusionBallANCS", 3},
}; };
static const std::pair<const char*, u32> BallCharacters[] = { const std::pair<const char*, u32> BallCharacters[] = {
{"SamusBallANCS", 0}, {"SamusBallANCS", 0}, {"SamusBallANCS", 1}, {"SamusBallANCS", 0}, {"SamusBallANCS", 0}, {"SamusBallANCS", 0}, {"SamusBallANCS", 1}, {"SamusBallANCS", 0},
{"SamusFusionBallANCS", 0}, {"SamusFusionBallANCS", 2}, {"SamusFusionBallANCS", 1}, {"SamusFusionBallANCS", 3}, {"SamusFusionBallANCS", 0}, {"SamusFusionBallANCS", 2}, {"SamusFusionBallANCS", 1}, {"SamusFusionBallANCS", 3},
}; };
static const u32 SpiderBallGlowColorIdxs[] = {3, 3, 2, 4, 5, 7, 6, 8}; const u32 SpiderBallGlowColorIdxs[] = {
3, 3, 2, 4, 5, 7, 6, 8,
};
static const u32 BallGlowColorIdxs[] = {0, 0, 1, 0, 5, 7, 6, 8}; const u32 BallGlowColorIdxs[] = {
0, 0, 1, 0, 5, 7, 6, 8,
};
static const char* BeamModels[] = {"CMDL_InvPowerBeam", "CMDL_InvIceBeam", "CMDL_InvWaveBeam", "CMDL_InvPlasmaBeam", const char* BeamModels[] = {
"CMDL_InvPowerBeam"}; "CMDL_InvPowerBeam", "CMDL_InvIceBeam", "CMDL_InvWaveBeam", "CMDL_InvPlasmaBeam", "CMDL_InvPowerBeam",
};
static const char* VisorModels[] = {"CMDL_InvVisor", "CMDL_InvGravityVisor", "CMDL_InvVisor", const char* VisorModels[] = {
"CMDL_InvPhazonVisor", "CMDL_InvFusionVisor", "CMDL_InvFusionVisor", "CMDL_InvVisor", "CMDL_InvGravityVisor", "CMDL_InvVisor", "CMDL_InvPhazonVisor",
"CMDL_InvFusionVisor", "CMDL_InvFusionVisor"}; "CMDL_InvFusionVisor", "CMDL_InvFusionVisor", "CMDL_InvFusionVisor", "CMDL_InvFusionVisor",
};
static const char* FinModels[] = {"CMDL_InvPowerFins", "CMDL_InvPowerFins", "CMDL_InvPowerFins", const char* FinModels[] = {
"CMDL_InvPowerFins", "CMDL_InvPowerFins", "CMDL_InvVariaFins", "CMDL_InvPowerFins", "CMDL_InvPowerFins", "CMDL_InvPowerFins", "CMDL_InvPowerFins",
"CMDL_InvGravityFins", "CMDL_InvPhazonFins"}; "CMDL_InvPowerFins", "CMDL_InvVariaFins", "CMDL_InvGravityFins", "CMDL_InvPhazonFins",
};
static const u32 Character1Idxs[8] = {0, 6, 2, 10, 16, 24, 20, 28}; const u32 Character1Idxs[8] = {
0, 6, 2, 10, 16, 24, 20, 28,
};
static const u32 CharacterBootsIdxs[8] = {1, 7, 3, 11, 17, 25, 21, 29}; const u32 CharacterBootsIdxs[8] = {
1, 7, 3, 11, 17, 25, 21, 29,
};
static const u32 Character2and3Idxs[8][2] = {{14, 15}, {8, 9}, {4, 5}, {12, 13}, const u32 Character2and3Idxs[8][2] = {
{18, 19}, {26, 27}, {22, 23}, {30, 31}}; {14, 15}, {8, 9}, {4, 5}, {12, 13}, {18, 19}, {26, 27}, {22, 23}, {30, 31},
};
} // Anonymous namespace
CSamusDoll::CSamusDoll(const CDependencyGroup& suitDgrp, const CDependencyGroup& ballDgrp, CSamusDoll::CSamusDoll(const CDependencyGroup& suitDgrp, const CDependencyGroup& ballDgrp,
CPlayerState::EPlayerSuit suit, CPlayerState::EBeamId beam, bool hasSpiderBall, CPlayerState::EPlayerSuit suit, CPlayerState::EBeamId beam, bool hasSpiderBall,