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

CIceSheegoth: Make use of in-class initializers for bitfields 

Same behavior, less code.
This commit is contained in:
Lioncash 2020-06-11 10:18:01 -04:00
parent 2a357a1006
commit 58186ad5df
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/MP1/World/CIceSheegoth.cpp
View File

@ -106,22 +106,7 @@ CIceSheegoth::CIceSheegoth(TUniqueId uid, std::string_view name, const CEntityIn
CElementGen::EOptionalSystemFlags::One)) CElementGen::EOptionalSystemFlags::One))
, xac8_(g_SimplePool->GetObj({SBIG('ELSC'), sheegothData.Get_x1ac()})) , xac8_(g_SimplePool->GetObj({SBIG('ELSC'), sheegothData.Get_x1ac()}))
, xad8_(std::make_unique<CParticleElectric>(xac8_)) , xad8_(std::make_unique<CParticleElectric>(xac8_))
, xadc_(g_SimplePool->GetObj({SBIG('PART'), sheegothData.Get_x19c()})) , xadc_(g_SimplePool->GetObj({SBIG('PART'), sheegothData.Get_x19c()})) {
, xb28_24_shotAt(false)
, xb28_25_(false)
, xb28_26_(false)
, xb28_27_(false)
, xb28_28_(false)
, xb28_29_(false)
, xb28_30_(false)
, xb28_31_(false)
, xb29_24_(false)
, xb29_25_(false)
, xb29_26_(false)
, xb29_27_(false)
, xb29_28_(false)
, xb29_29_scanned(false) {
UpdateTouchBounds(); UpdateTouchBounds();
x460_knockBackController.SetEnableFreeze(false); x460_knockBackController.SetEnableFreeze(false);
x460_knockBackController.SetX82_24(false); x460_knockBackController.SetX82_24(false);

28
Runtime/MP1/World/CIceSheegoth.hpp
View File

@ -132,20 +132,20 @@ class CIceSheegoth : public CPatterned {
rstl::reserved_vector<TUniqueId, 2> xafc_gillColliders; rstl::reserved_vector<TUniqueId, 2> xafc_gillColliders;
rstl::reserved_vector<TUniqueId, 10> xb04_; rstl::reserved_vector<TUniqueId, 10> xb04_;
rstl::reserved_vector<CSegId, 7> xb1c_; rstl::reserved_vector<CSegId, 7> xb1c_;
bool xb28_24_shotAt : 1; bool xb28_24_shotAt : 1 = false;
bool xb28_25_ : 1; bool xb28_25_ : 1 = false;
bool xb28_26_ : 1; bool xb28_26_ : 1 = false;
bool xb28_27_ : 1; bool xb28_27_ : 1 = false;
bool xb28_28_ : 1; bool xb28_28_ : 1 = false;
bool xb28_29_ : 1; bool xb28_29_ : 1 = false;
bool xb28_30_ : 1; bool xb28_30_ : 1 = false;
bool xb28_31_ : 1; bool xb28_31_ : 1 = false;
bool xb29_24_ : 1; bool xb29_24_ : 1 = false;
bool xb29_25_ : 1; bool xb29_25_ : 1 = false;
bool xb29_26_ : 1; bool xb29_26_ : 1 = false;
bool xb29_27_ : 1; bool xb29_27_ : 1 = false;
bool xb29_28_ : 1; bool xb29_28_ : 1 = false;
bool xb29_29_scanned : 1; bool xb29_29_scanned : 1 = false;
void UpdateTouchBounds(); void UpdateTouchBounds();
bool IsMouthCollider(TUniqueId uid) { return xaf8_mouthCollider == uid; } bool IsMouthCollider(TUniqueId uid) { return xaf8_mouthCollider == uid; }