PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-12 11:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

More CPlayerGun matches

Browse Source 
Former-commit-id: ec34055dbb
This commit is contained in:
Phillip Stephens
2022-10-06 07:24:38 -07:00
parent 514fd7f501
commit f507623c40
4 changed files with 171 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/MetroidPrime/Player/CPlayerGun.hpp
View File

@@ -122,7 +122,7 @@ public:
void ActivateCombo(CStateManager&);
void EnableChargeFx(CPlayerState::EChargeStage, CStateManager&);
void UpdateChargeState(float, CStateManager&);
void Reset(CStateManager&);
void Reset(CStateManager& mgr, bool);
void ResetCharge(CStateManager&, bool);
void ResetBeamParams(CStateManager&, const CPlayerState&, bool);
void ChangeWeapon(const CPlayerState&, CStateManager&);
@@ -177,6 +177,9 @@ public:
static float GetTractorBeamFactor() { return skTractorBeamFactor; }
s32 GetStateFlags() const { return x2f8_stateFlags; }
void SetStateFlags(s32 flags) { x2f8_stateFlags = flags; }
private:
class CGunMorph {
public:
@@ -275,7 +278,7 @@ private:
uint x2f0_pressedFireButtonStates;
uint x2f4_fireButtonStates;
// 0x1: beam mode, 0x2: missile mode, 0x4: missile ready, 0x8: morphing, 0x10: combo fire
uint x2f8_stateFlags;
s32 x2f8_stateFlags;
uint x2fc_fidgetAnimBits;
uint x300_remainingMissiles;
uint x304_;