PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match CGunMotion::Update 

Former-commit-id: d54cc35e8d
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-07 02:12:59 +03:00
parent e75876c5ea
commit 02fc116666
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/MetroidPrime/Weapons/GunController/CGunController.hpp
View File

@ -38,7 +38,7 @@ public:
void EnterFidget(CStateManager&, int, int, int); void EnterFidget(CStateManager&, int, int, int);
void EnterStruck(CStateManager&, float); void EnterStruck(CStateManager&, float);
void LoadFidgetAnimAsync(CStateManager&, int, int, int); void LoadFidgetAnimAsync(CStateManager&, int, int, int);
bool Update(float, CStateManager&); int Update(float, CStateManager&);
void EnterIdle(CStateManager&); void EnterIdle(CStateManager&);
void ReturnToDefault(CStateManager&, float); void ReturnToDefault(CStateManager&, float);
void Reset(); void Reset();

4
src/MetroidPrime/Weapons/GunController/CGunController.cpp
View File

@ -17,8 +17,8 @@ void CGunController::EnterStruck(CStateManager&, float) {}
void CGunController::LoadFidgetAnimAsync(CStateManager&, int, int, int) {} void CGunController::LoadFidgetAnimAsync(CStateManager&, int, int, int) {}
bool CGunController::Update(float, CStateManager&) { int CGunController::Update(float, CStateManager&) {
return false; return 0;
} }
void CGunController::EnterIdle(CStateManager&) {} void CGunController::EnterIdle(CStateManager&) {}

8
src/MetroidPrime/Weapons/GunController/CGunMotion.cpp
View File

@ -63,7 +63,13 @@ bool CGunMotion::PlayPasAnim(SamusGun::EAnimationState state, CStateManager& mgr
return loop; return loop;
} }
void CGunMotion::Update(float, CStateManager&) {} void CGunMotion::Update(float dt, CStateManager& mgr) {
x0_modelData.AdvanceAnimation(dt, mgr, kInvalidAreaId, true);
switch (x4c_gunController.Update(dt, mgr)) {
case 1:
xb8_24_animPlaying = false;
}
}
void CGunMotion::Draw(const CStateManager&, const CTransform4f&) const {} void CGunMotion::Draw(const CStateManager&, const CTransform4f&) const {}