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

Finish CGrappleArm

Browse Source
This commit is contained in:
Jack Andersen
2017-09-03 16:22:46 -10:00
parent 91600c31bf
commit 640623f3ef
25 changed files with 1042 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Weapon/CGunController.hpp
View File

@@ -40,8 +40,8 @@ public:
}
void UnLoadFidget() { x30_fidget.UnLoadAnim(); }
void LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 parm2);
void EnterFidget(CStateManager& mgr, s32 type, s32 gunId, s32 parm2);
void LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
void EnterFidget(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
bool IsFidgetLoaded() const { return x30_fidget.IsAnimLoaded(); }
s32 GetFreeLookSetId() const { return x4_freeLook.GetSetId(); }
bool IsComboOver() const { return x1c_comboFire.IsComboOver(); }
@@ -53,6 +53,7 @@ public:
void ReturnToDefault(CStateManager& mgr, float dt, bool setState);
void ReturnToBasePosition(CStateManager&, float);
void Reset();
s32 GetCurAnimId() const { return x54_curAnimId; }
};
}