AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 17:44:56 +00:00
Code Issues Projects Releases Wiki Activity

More CPlayer implementations

Browse Source
This commit is contained in:
Jack Andersen
2017-07-19 07:47:57 -10:00
parent ccc3b99940
commit c5514b3374
6 changed files with 122 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Weapon/CGrappleArm.hpp
View File

@@ -32,6 +32,7 @@ private:
struct
{
bool x3b2_25_beamActive : 1;
bool x3b2_27_armMoving : 1;
};
u32 _dummy = 0;
};
@@ -43,6 +44,7 @@ public:
void SetAnimState(EArmState state);
EArmState GetAnimState() const { return x334_animState; }
bool BeamActive() const { return x3b2_25_beamActive; }
bool IsArmMoving() const { return x3b2_27_armMoving; }
void Activate(bool);
void GrappleBeamDisconnected();
void GrappleBeamConnected();

4
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -111,7 +111,7 @@ private:
float x3a0_ = 0.f;
CFidget x3a4_fidget;
zeus::CVector3f x3dc_damageLocation;
zeus::CTransform x3e8_;
zeus::CTransform x3e8_xf;
zeus::CTransform x418_;
zeus::CTransform x448_;
zeus::CTransform x478_;
@@ -220,7 +220,7 @@ public:
u32 GetSelectedBeam() const { return x310_selectedBeam; }
u32 GetPendingSelectedBeam() const { return x314_pendingSelectedBeam; }
const CGunMorph& GetGunMorph() const { return x678_morph; }
void SetX3e8(const zeus::CTransform& xf) { x3e8_ = xf; }
void SetTransform(const zeus::CTransform& xf) { x3e8_xf = xf; }
CGrappleArm& GetGrappleArm() { return *x740_grappleArm; }
void DamageRumble(const zeus::CVector3f& location, float damage, const CStateManager& mgr);
void ProcessInput(const CFinalInput& input, CStateManager& mgr);