diff options
Diffstat (limited to 'src/d/actor/d_a_am.cpp')
| -rw-r--r-- | src/d/actor/d_a_am.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index bcd54e39..a69abe01 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -131,12 +131,17 @@ static BOOL daAM_Draw(am_class* i_this) { static void anm_init(am_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) { i_this->mCurrBckIdx = bckFileIdx; if (soundFileIdx >= 0) { - void* soundAnm = dComIfG_getObjectRes("AM", soundFileIdx); - J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx); - i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, soundAnm); + i_this->mpMorf->setAnm( + (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx), + loopMode, morf, speed, 0.0f, -1.0f, + dComIfG_getObjectRes("AM", soundFileIdx) + ); } else { - J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx); - i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, NULL); + i_this->mpMorf->setAnm( + (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx), + loopMode, morf, speed, 0.0f, -1.0f, + NULL + ); } } @@ -144,7 +149,7 @@ static void anm_init(am_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f3 static void body_atari_check(am_class* i_this) { daPy_py_c* player = daPy_getPlayerActorClass(); -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_JPN if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) { return; } |