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

Lots of CPlayer implementations

Browse Source
This commit is contained in:
Jack Andersen
2017-06-11 18:23:34 -10:00
parent 46c70ecf11
commit 4f33422423
50 changed files with 940 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/CSamusHud.cpp
View File

@@ -141,7 +141,7 @@ void CSamusHud::InitializeFrameGlueMutable(const CStateManager& mgr)
CPlayerGun& gun = *player.GetPlayerGun();
float chargeFactor = gun.IsCharging() ? gun.GetChargeBeamFactor() : 0.f;
bool missilesActive = gun.GetMissleMode() == CPlayerGun::EMissleMode::Active;
bool lockedOnObj = player.GetLockonObjectId() != kInvalidUniqueId;
bool lockedOnObj = player.GetOrbitTargetId() != kInvalidUniqueId;
switch (x2bc_nextState)
{
@@ -501,7 +501,7 @@ void CSamusHud::UpdateFreeLook(float dt, const CStateManager& mgr)
if (x298_freeLookIntf)
x298_freeLookIntf->SetFreeLookState(inFreeLook, lookControlHeld,
player.GetLockonObjectId() != kInvalidUniqueId,
player.GetOrbitTargetId() != kInvalidUniqueId,
offHorizonAngle);
if (x564_freeLookSfx)