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

Match CGSFreeLook::Update

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-09 01:20:08 +03:00
parent a1ee7b17e8
commit caef0a6d66
No known key found for this signature in database
GPG Key ID: E224F951761145F8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/MetroidPrime/CAnimData.hpp
View File

@ -191,14 +191,14 @@ private:
int x214_passedParticleCount; int x214_passedParticleCount;
int x218_passedSoundCount; int x218_passedSoundCount;
int x21c_particleLightIdx; int x21c_particleLightIdx;
bool x220_24_animating : 1; u8 x220_24_animating : 1;
bool x220_25_loop : 1; u8 x220_25_loop : 1;
bool x220_26_aligningPos : 1; u8 x220_26_aligningPos : 1;
bool x220_27_ : 1; u8 x220_27_ : 1;
bool x220_28_ : 1; u8 x220_28_ : 1;
bool x220_29_animationJustStarted : 1; u8 x220_29_animationJustStarted : 1;
bool x220_30_poseBuilt : 1; u8 x220_30_poseBuilt : 1;
bool x220_31_poseCached : 1; u8 x220_31_poseCached : 1;
CPoseAsTransforms x224_pose; CPoseAsTransforms x224_pose;
CHierarchyPoseBuilder x2fc_poseBuilder; CHierarchyPoseBuilder x2fc_poseBuilder;
CAnimPlaybackParms x40c_playbackParms; CAnimPlaybackParms x40c_playbackParms;

2
src/MetroidPrime/Weapons/GunController/CGSFreeLook.cpp
View File

@ -19,7 +19,7 @@ bool CGSFreeLook::Update(CAnimData& data, float dt, CStateManager& mgr) {
x0_delay = 0.f; x0_delay = 0.f;
x4_cueAnimId = -1; x4_cueAnimId = -1;
} }
} else if (!data.IsAnimTimeRemaining(0.001f, "Whole Body")) { } else if (!data.IsAnimTimeRemaining(0.001f, rstl::string_l("Whole Body"))) {
switch (x8_loopState) { switch (x8_loopState) {
case 0: case 0:
SetAnim(data, xc_gunId, x10_setId, 1, mgr, 0.f); SetAnim(data, xc_gunId, x10_setId, 1, mgr, 0.f);