diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h index 5aca3e23..3b2d2662 100644 --- a/LEGO1/omni/include/mxomni.h +++ b/LEGO1/omni/include/mxomni.h @@ -48,7 +48,7 @@ class MxOmni : public MxCore { virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28 virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+2c virtual MxEntity* AddToWorld(const char*, MxS32, MxPresenter*); // vtable+30 - virtual void NotifyCurrentEntity(MxNotificationParam* p_param); // vtable+34 + virtual void NotifyCurrentEntity(const MxNotificationParam& p_param); // vtable+34 virtual void StartTimer(); // vtable+38 virtual void StopTimer(); // vtable+3c diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index 9509dbca..be530f58 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -58,16 +58,9 @@ void MxPresenter::EndAction() AUTOLOCK(m_criticalSection); if (!this->m_compositePresenter) { -#ifdef COMPAT_MODE - { - MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE); - MxOmni::GetInstance()->NotifyCurrentEntity(¶m); - } -#else MxOmni::GetInstance()->NotifyCurrentEntity( - &MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE) + MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE) ); -#endif } this->m_action = NULL; diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp index bb7a337d..724b1e94 100644 --- a/LEGO1/omni/src/main/mxomni.cpp +++ b/LEGO1/omni/src/main/mxomni.cpp @@ -42,7 +42,7 @@ MxEntity* MxOmni::AddToWorld(const char*, MxS32, MxPresenter*) } // FUNCTION: LEGO1 0x100aefc0 -void MxOmni::NotifyCurrentEntity(MxNotificationParam* p_param) +void MxOmni::NotifyCurrentEntity(const MxNotificationParam& p_param) { } diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp index 69b11054..c90e377c 100644 --- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp @@ -334,16 +334,9 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action) AUTOLOCK(m_criticalSection); if (m_unk0x54.Find(p_action, FALSE) == NULL) { if (VTable0x30(p_action) == SUCCESS) { -#ifdef COMPAT_MODE - { - MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE); - MxOmni::GetInstance()->NotifyCurrentEntity(¶m); - } -#else MxOmni::GetInstance()->NotifyCurrentEntity( - &MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE) + MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE) ); -#endif } }