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

Additional CPlayerGun implementations; downcast macro for tweak pointers

Browse Source
This commit is contained in:
Jack Andersen
2017-08-26 17:02:18 -10:00
parent 86ada63867
commit 1f7e8e1033
38 changed files with 780 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Weapon/CGunController.cpp
View File

@@ -6,14 +6,14 @@
namespace urde
{
void CGunController::LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 parm1, s32 parm2)
void CGunController::LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 parm2)
{
x30_fidget.LoadAnimAsync(*x0_modelData.AnimationData(), type, parm1, parm2, mgr);
x30_fidget.LoadAnimAsync(*x0_modelData.AnimationData(), type, gunId, parm2, mgr);
}
void CGunController::EnterFidget(CStateManager& mgr, s32 type, s32 parm1, s32 parm2)
void CGunController::EnterFidget(CStateManager& mgr, s32 type, s32 gunId, s32 parm2)
{
x54_curAnimId = x30_fidget.SetAnim(*x0_modelData.AnimationData(), type, parm1, parm2, mgr);
x54_curAnimId = x30_fidget.SetAnim(*x0_modelData.AnimationData(), type, gunId, parm2, mgr);
x50_gunState = EGunState::Fidget;
}