AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-09-21 07:49:42 +00:00
Code Issues Projects Releases Wiki Activity

CRidley: Mark skDirectNormal and skIceWeakness as constexpr

Browse Source 
Allows elimination of runtime initializers.
This commit is contained in:
Lioncash 2020-05-09 22:41:30 -04:00
parent ec79a9de89
commit 306b8ad289
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Runtime/MP1/World/CRidley.cpp
View File

@ -193,22 +193,22 @@ constexpr std::array<SSomeRidleyStruct3, 6> skFloats{{{0.0, 20.0, 40.0, 0.0, 0.0
{0.0, 0.0, 50.0, 0.0, 0.0, 50.0}, {0.0, 0.0, 50.0, 0.0, 0.0, 50.0},
{0.0, 40.0, 60.0, 0.0, 0.0, 0.0}}}; {0.0, 40.0, 60.0, 0.0, 0.0, 0.0}}};
const CDamageVulnerability skDirectNormal{EVulnerability::DirectNormal, EVulnerability::DirectNormal, constexpr CDamageVulnerability skDirectNormal{EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EDeflectType::None}; EVulnerability::DirectNormal, EDeflectType::None};
const CDamageVulnerability skIceWeakness{EVulnerability::DirectNormal, EVulnerability::DirectWeak, constexpr CDamageVulnerability skIceWeakness{EVulnerability::DirectNormal, EVulnerability::DirectWeak,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal, EVulnerability::DirectNormal,
EVulnerability::DirectNormal, EDeflectType::None}; EVulnerability::DirectNormal, EDeflectType::None};
} // namespace } // namespace
CRidleyData::CRidleyData(CInputStream& in, u32 propCount) CRidleyData::CRidleyData(CInputStream& in, u32 propCount)
: x0_(in) : x0_(in)