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

Massive fmtlib refactor

Browse Source
This commit is contained in:
Jack Andersen
2019-07-19 18:27:21 -10:00
parent e38a3ece89
commit 7a3da1f7a6
228 changed files with 2071 additions and 2116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -41,7 +41,7 @@ public:
ComboXferDone,
ComboFire,
ComboFireDone,
ChargeCancelled,
ChargeCooldown,
ChargeDone
};
enum class ENextState {
@@ -148,7 +148,7 @@ private:
EPhazonBeamState x33c_phazonBeamState = EPhazonBeamState::Inactive;
float x340_chargeBeamFactor = 0.f;
float x344_comboXferTimer = 0.f;
float x348_chargeCancelTimer = 0.f;
float x348_chargeCooldownTimer = 0.f;
float x34c_shakeX = 0.f;
float x350_shakeZ = 0.f;
float x354_bombFuseTime;
@@ -220,7 +220,7 @@ private:
union {
struct {
bool x832_24_cancellingCharge : 1;
bool x832_24_coolingCharge : 1;
bool x832_25_chargeEffectVisible : 1;
bool x832_26_comboFiring : 1;
bool x832_27_chargeAnimStarted : 1;