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

Implement CScriptSpecialFunction::ThinkAreaDamage, and more CThardus

Browse Source
This commit is contained in:
Phillip Stephens
2019-11-24 07:01:07 -08:00
parent 655dc01a06
commit 697a100bca
16 changed files with 241 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CPlayer.hpp
View File

@@ -332,8 +332,8 @@ private:
float xa04_preThinkDt = 0.f;
CAssetId xa08_steamTextureId;
CAssetId xa0c_iceTextureId;
u32 xa10_phazonCounter = 0;
float xa14_phazonCameraShakeTimer = 0.f;
u32 xa10_envDmgCounter = 0;
float xa14_envDmgCameraShakeTimer = 0.f;
float xa18_phazonDamageLag = 0.f;
float xa1c_threatOverride = 0.f;
float xa20_radarXYRadiusOverride = 1.f;
@@ -421,7 +421,7 @@ public:
void UpdateFrozenState(const CFinalInput& input, CStateManager& mgr);
void UpdateStepCameraZBias(float dt);
void UpdateWaterSurfaceCameraBias(CStateManager& mgr);
void UpdatePhazonCameraShake(float dt, CStateManager& mgr);
void UpdateEnvironmentDamageCameraShake(float dt, CStateManager& mgr);
void UpdatePhazonDamage(float dt, CStateManager& mgr);
void ResetPlayerHintState();
bool SetAreaPlayerHint(const CScriptPlayerHint& hint, CStateManager& mgr);
@@ -604,8 +604,8 @@ public:
ESurfaceRestraints GetSurfaceRestraint() const {
return x2b0_outOfWaterTicks == 2 ? GetCurrentSurfaceRestraint() : ESurfaceRestraints::Water;
}
void DecrementPhazon();
void IncrementPhazon();
void DecrementEnvironmentDamage();
void IncrementEnvironmentDamage();
void ApplySubmergedPitchBend(CSfxHandle& sfx);
void DetachActorFromPlayer();
bool AttachActorToPlayer(TUniqueId id, bool disableGun);