etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-12-22 08:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed double dynos animation swap (#32)

Browse source 
this usually was a bug caused by mirror mario, where animInfo.curAnim was NULL, but the swap was still carried out
This commit is contained in:
Isaac0-dev 2024-05-09 21:36:32 +10:00 committed by GitHub
parent a5c4e29d2f
commit 7b4a223b67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/dynos_mgr_anim.cpp
View file

@ -47,7 +47,7 @@ void DynOS_Anim_Swap(void *aPtr) {
// Does the object have a model?
struct Object *_Object = (struct Object *) aPtr;
if (!_Object->header.gfx.sharedChild) {
if (!_Object->header.gfx.sharedChild || !_Object->header.gfx.animInfo.curAnim) {
return;
}
@ -78,6 +78,7 @@ void DynOS_Anim_Swap(void *aPtr) {
if (gMarioStates[i].marioObj == NULL) { continue; }
if (_Object == gMarioStates[i].marioObj) {
_AnimIndex = RetrieveCurrentMarioAnimationIndex(i);
break;
}
}
if (_AnimIndex == -1) {