diff options
Diffstat (limited to 'src/d/actor/d_a_mmusic.cpp')
| -rw-r--r-- | src/d/actor/d_a_mmusic.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 8cfc911f..900c107b 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -13,12 +13,13 @@ namespace daMmusic { namespace { struct Attr_c { - /* 0x00 */ u32 mTimer; + /* 0x00 */ u16 field_0x00; + /* 0x02 */ u16 field_0x02; /* 0x04 */ u16 field_0x04; }; static const Attr_c L_attr = { - 120, 180, + 0, 120, 180, }; inline const Attr_c & attr() { return L_attr; } @@ -59,14 +60,16 @@ cPhs_State daMmusic::Act_c::_create() { fopAcM_SetupActor(this, Act_c); cPhs_State ret = cPhs_COMPLEATE_e; - if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { - set_mtx(); - fopAcM_SetMtx(this, mMtx); - field_0x298 = Macore_is_playing(); - fopAcM_setCullSizeSphere(this, 0.0f, 0.0f, 0.0f, 300.0f); - init_se(); - } else { - ret = cPhs_ERROR_e; + if (ret == cPhs_COMPLEATE_e) { + if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { + set_mtx(); + fopAcM_SetMtx(this, mMtx); + field_0x298 = Macore_is_playing(); + fopAcM_setCullSizeSphere(this, 0.0f, 0.0f, 0.0f, 300.0f); + init_se(); + } else { + ret = cPhs_ERROR_e; + } } return ret; } |