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

Reasonably match CPlayerGun constructor

Browse Source 
Former-commit-id: 72d07311fd
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-06 13:38:13 +03:00
parent 3caccf5974
commit ba9faeb44c
15 changed files with 241 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,9 @@ private:
kD_Done,
};
CGunMorph(float gunTransformTime, float holoHoldTime)
: x4_gunTransformTime(gunTransformTime), x10_holoHoldTime(fabs(holoHoldTime)) {}
CGunMorph(float gunTransformTime, float holoHoldTime);
// CGunMorph(float gunTransformTime, float holoHoldTime)
// : x4_gunTransformTime(gunTransformTime), x10_holoHoldTime(fabs(holoHoldTime)) {}
EMorphEvent Update(float inY, float outY, float dt);
void StartWipe(EDir dir);
@@ -162,6 +163,18 @@ private:
kFS_Firing,
};
CMotionState()
: x0_24_extendParabola(true)
, x4_extendParabolaDelayTimer(0.f)
, x8_fireTime(0.f)
, xc_curExtendDist(0.f)
, x10_curRotation(0.f)
, x14_rotationT(0.f)
, x18_startRotation(0.f)
, x1c_endRotation(0.f)
, x20_state(kMS_Zero)
, x24_fireState(kFS_NotFiring) {}
static void SetExtendDistance(float d) { kGunExtendDistance = d; }
void SetState(EMotionState state) { x20_state = state; }
@@ -315,6 +328,9 @@ private:
bool x835_27_intoPhazonBeam : 1;
bool x835_28_bombReady : 1;
bool x835_29_powerBombReady : 1;
bool x835_30_inPhazonPool : 1;
bool x835_31_actorAttached : 1;
// bool x835_32_unk : 1;
};
CHECK_SIZEOF(CPlayerGun, 0x838)