AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Initial CPlayerGun implementations

Browse Source
This commit is contained in:
Jack Andersen
2017-08-24 20:18:09 -10:00
parent e8a55d84d4
commit ed991a6ac0
29 changed files with 685 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CPlayer.hpp
View File

@@ -347,7 +347,7 @@ private:
std::unique_ptr<CModelData> x7f0_ballTransitionBeamModel;
zeus::CTransform x7f4_gunWorldXf;
float x824_transitionFilterTimer = 0.f;
float x828_waterLevelOnPlayer = 0.f;
float x828_distanceUnderWater = 0.f;
bool x82c_inLava = false;
TUniqueId x82e_ridingPlatform = kInvalidUniqueId;
TUniqueId x830_playerHint = kInvalidUniqueId;
@@ -429,6 +429,7 @@ public:
float, float, const CMaterialList&);
bool IsTransparent() const;
bool GetControlsFrozen() const { return x760_controlsFrozen; }
float GetTransitionAlpha(const zeus::CVector3f& camPos, float zNear) const;
s32 ChooseTransitionToAnimation(float dt, CStateManager& mgr) const;
void TransitionToMorphBallState(float dt, CStateManager& mgr);
@@ -663,7 +664,9 @@ public:
void ApplySubmergedPitchBend(CSfxHandle& sfx);
void DetachActorFromPlayer();
bool AttachActorToPlayer(TUniqueId id, bool disableGun);
TUniqueId GetAttachedActor() const { return x26c_attachedActor; }
float GetAttachedActorStruggle() const { return xa28_attachedActorStruggle; }
float GetDistanceUnderWater() const { return x828_distanceUnderWater; }
};
}