Runtime/MP1/World: Replace bitfield unions with constructor initializers

2025-12-14 14:46:09 +00:00 · 2020-04-10 15:33:05 -04:00
parent 402e45ecb5
commit 153004faee
14 changed files with 154 additions and 147 deletions
--- a/Runtime/MP1/World/CSpacePirate.hpp
+++ b/Runtime/MP1/World/CSpacePirate.hpp
@@ -97,61 +97,56 @@ private:
  };

  CSpacePirateData x568_pirateData;
-  union {
-    struct {
-      bool x634_24_pendingAmbush : 1;
-      bool x634_25_ceilingAmbush : 1;
-      bool x634_26_nonAggressive : 1;
-      bool x634_27_melee : 1;
-      bool x634_28_noShuffleCloseCheck : 1;
-      bool x634_29_onlyAttackInRange : 1;
-      bool x634_30_ : 1;
-      bool x634_31_noKnockbackImpulseReset : 1;
-      bool x635_24_noMeleeAttack : 1;
-      bool x635_25_breakAttack : 1;
-      bool x635_26_seated : 1;
-      bool x635_27_shadowPirate : 1;
-      bool x635_28_alertBeforeCloak : 1;
-      bool x635_29_noBreakDodge : 1;
-      bool x635_30_floatingCorpse : 1;
-      bool x635_31_ragdollNoAiCollision : 1;
-      bool x636_24_trooper : 1;
-      bool x636_25_hearNoise : 1;
-      bool x636_26_enableMeleeAttack : 1;
-      bool x636_27_ : 1;
-      bool x636_28_ : 1;
-      bool x636_29_enableRetreat : 1;
-      bool x636_30_shuffleClose : 1;
-      bool x636_31_inAttackState : 1;
-      bool x637_24_enablePatrol : 1;
-      bool x637_25_enableAim : 1;
-      bool x637_26_hearPlayerFire : 1;
-      bool x637_27_inProjectilePath : 1;
-      bool x637_28_noPlayerLos : 1;
-      bool x637_29_inWallHang : 1;
-      bool x637_30_jumpVelSet : 1;
-      bool x637_31_prevInCineCam : 1;
-      bool x638_24_pendingFrenzyChance : 1;
-      bool x638_25_appliedBladeDamage : 1;
-      bool x638_26_alwaysAggressive : 1;
-      bool x638_27_coverCheck : 1;
-      bool x638_28_enableDodge : 1;
-      bool x638_29_noPlayerDodge : 1;
-      bool x638_30_ragdollOver : 1;
-      bool x638_31_mayStartAttack : 1;
-      bool x639_24_ : 1;
-      bool x639_25_useJumpBackJump : 1;
-      bool x639_26_started : 1;
-      bool x639_27_inRange : 1;
-      bool x639_28_satUp : 1;
-      bool x639_29_enableBreakDodge : 1;
-      bool x639_30_closeMelee : 1;
-      bool x639_31_sentAttackMsg : 1;
-      bool x63a_24_normalDodge : 1;
-    };

-    u64 _dummy = 0;
-  };
+  bool x634_24_pendingAmbush : 1;
+  bool x634_25_ceilingAmbush : 1;
+  bool x634_26_nonAggressive : 1;
+  bool x634_27_melee : 1;
+  bool x634_28_noShuffleCloseCheck : 1;
+  bool x634_29_onlyAttackInRange : 1;
+  bool x634_30_ : 1;
+  bool x634_31_noKnockbackImpulseReset : 1;
+  bool x635_24_noMeleeAttack : 1;
+  bool x635_25_breakAttack : 1;
+  bool x635_26_seated : 1;
+  bool x635_27_shadowPirate : 1;
+  bool x635_28_alertBeforeCloak : 1;
+  bool x635_29_noBreakDodge : 1;
+  bool x635_30_floatingCorpse : 1;
+  bool x635_31_ragdollNoAiCollision : 1;
+  bool x636_24_trooper : 1;
+  bool x636_25_hearNoise : 1;
+  bool x636_26_enableMeleeAttack : 1;
+  bool x636_27_ : 1;
+  bool x636_28_ : 1;
+  bool x636_29_enableRetreat : 1;
+  bool x636_30_shuffleClose : 1;
+  bool x636_31_inAttackState : 1;
+  bool x637_24_enablePatrol : 1;
+  bool x637_25_enableAim : 1;
+  bool x637_26_hearPlayerFire : 1;
+  bool x637_27_inProjectilePath : 1;
+  bool x637_28_noPlayerLos : 1;
+  bool x637_29_inWallHang : 1;
+  bool x637_30_jumpVelSet : 1;
+  bool x637_31_prevInCineCam : 1;
+  bool x638_24_pendingFrenzyChance : 1;
+  bool x638_25_appliedBladeDamage : 1;
+  bool x638_26_alwaysAggressive : 1;
+  bool x638_27_coverCheck : 1;
+  bool x638_28_enableDodge : 1;
+  bool x638_29_noPlayerDodge : 1;
+  bool x638_30_ragdollOver : 1;
+  bool x638_31_mayStartAttack : 1;
+  bool x639_24_ : 1;
+  bool x639_25_useJumpBackJump : 1;
+  bool x639_26_started : 1;
+  bool x639_27_inRange : 1;
+  bool x639_28_satUp : 1;
+  bool x639_29_enableBreakDodge : 1;
+  bool x639_30_closeMelee : 1;
+  bool x639_31_sentAttackMsg : 1;
+  bool x63a_24_normalDodge : 1;

  s32 x63c_frenzyFrames = 0;
  TUniqueId x640_coverPoint = kInvalidUniqueId;