2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +00:00

zeus constexpr refactor and thermal visor fixes

This commit is contained in:
Jack Andersen
2019-02-23 21:15:54 -10:00
parent 1186b8097c
commit 8df0a4913c
226 changed files with 1339 additions and 1305 deletions

View File

@@ -204,7 +204,7 @@ protected:
float x420_curDamageRemTime = 0.f;
float x424_damageWaitTime;
float x428_damageCooldownTimer = -1.f;
zeus::CColor x42c_color = zeus::CColor::skBlack;
zeus::CColor x42c_color = zeus::skBlack;
zeus::CColor x430_damageColor = skDamageColor;
zeus::CVector3f x434_posDelta;
zeus::CQuaternion x440_rotDelta;
@@ -229,7 +229,7 @@ protected:
rstl::optional<TLockedToken<CElectricDescription>> x530_deathExplosionElectric;
zeus::CVector3f x540_iceDeathExplosionOffset;
rstl::optional<TLockedToken<CGenDescription>> x54c_iceDeathExplosionParticle;
zeus::CVector3f x55c_moveScale = zeus::CVector3f::skOne;
zeus::CVector3f x55c_moveScale = zeus::skOne3f;
void MakeThermalColdAndHot();
void UpdateThermalFrozenState(bool thawed);