diff options
| -rw-r--r-- | include/d/actor/d_a_obj_majyuu_door.h | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_majyuu_door.cpp | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/d/actor/d_a_obj_majyuu_door.h b/include/d/actor/d_a_obj_majyuu_door.h index ceea29dd..e3744f42 100644 --- a/include/d/actor/d_a_obj_majyuu_door.h +++ b/include/d/actor/d_a_obj_majyuu_door.h @@ -58,6 +58,8 @@ class daObj_MjDoorHIO_c : public mDoHIO_entry_c { public: daObj_MjDoorHIO_c(); + void genMessage(JORMContext* ctx) {} + public: /* 0x4 */ u8 field_0x4; }; diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 3f57947b..e5a5ff41 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -220,7 +220,7 @@ void daObj_MjDoor_c::modeDeleteInit() { } mMode = MODE_DELETE; - mDoAud_seStart(JA_SE_OBJ_MJ_GATE_BREAK, &eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + fopAcM_seStart(this, JA_SE_OBJ_MJ_GATE_BREAK, 0); cXyz scale(1.0f, 1.0f, 1.0f); dComIfGp_particle_set(dPa_name::ID_IT_SN_MJMON_HAHEN_L00, ¤t.pos, ¤t.angle, @@ -256,13 +256,7 @@ void daObj_MjDoor_c::modeDelete() { if (mSmoke.getEmitter() != NULL) { if (cLib_calcTimer(&mSmokeTimer) != 0) { if (mSmokeTimer <= 40) { -#if VERSION == VERSION_DEMO - u8 colorAlpha = mSmokeTimer * 5; - mSmoke.getEmitter()->mGlobalPrmColor.a = colorAlpha; -#else - JPABaseEmitter* emitter = mSmoke.getEmitter(); - emitter->mGlobalPrmColor.a = mSmokeTimer * 5; -#endif + mSmoke.getEmitter()->setGlobalAlpha(mSmokeTimer * 5); } } else { mSmoke.end(); |