izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pass in original animation from subs to Animation_change (#425)

Browse Source
This commit is contained in:
Archez
2024-05-22 09:05:05 -05:00
committed by Garrett Cox
parent bfa363204c
commit ac095e9abf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/code/z_sub_s.c
+6 -4
View File
@@ -538,8 +538,9 @@ s32 SubS_ChangeAnimationByInfoS(SkelAnime* skelAnime, AnimationInfoS* animationI
animationInfo += animIndex;
AnimationHeader* anim = animationInfo->animation;
AnimationHeader* ogAnim = anim;
if (ResourceMgr_OTRSigCheck(anim))
if (ResourceMgr_OTRSigCheck(anim))
anim = ResourceMgr_LoadAnimByName(anim);
endFrame = animationInfo->frameCount;
@@ -553,7 +554,7 @@ s32 SubS_ChangeAnimationByInfoS(SkelAnime* skelAnime, AnimationInfoS* animationI
if (animationInfo->playSpeed < 0.0f) {
SWAP(s32, endFrame, startFrame);
}
Animation_Change(skelAnime, anim, animationInfo->playSpeed, startFrame, endFrame,
Animation_Change(skelAnime, ogAnim, animationInfo->playSpeed, startFrame, endFrame,
animationInfo->mode, animationInfo->morphFrames);
return true;
}
@@ -1389,7 +1390,8 @@ void SubS_ChangeAnimationBySpeedInfo(SkelAnime* skelAnime, AnimationSpeedInfo* a
f32 endFrame;
f32 morphFrames;
AnimationHeader* anim = animation->animation;
AnimationHeader* anim = animation->animation;
AnimationHeader* ogAnim = anim;
if (ResourceMgr_OTRSigCheck(anim))
anim = ResourceMgr_LoadAnimByName(anim);
@@ -1411,7 +1413,7 @@ void SubS_ChangeAnimationBySpeedInfo(SkelAnime* skelAnime, AnimationSpeedInfo* a
startFrame = Animation_GetLastFrame(&anim->common);
endFrame = 0.0f;
}
Animation_Change(skelAnime, anim, animation->playSpeed, startFrame, endFrame, animation->mode,
Animation_Change(skelAnime, ogAnim, animation->playSpeed, startFrame, endFrame, animation->mode,
morphFrames);
*curAnimIndex = nextAnimIndex;
}