isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 15:48:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Make NotificationManager::Send take a const reference to notification (#836)

Browse source 
* Make NotificationManager::Send take a const reference to notification

* Fix virtual func
This commit is contained in:
Christian Semmler 2024-04-22 08:11:38 -04:00 committed by GitHub
parent 0e0d6890ad
commit f1688be263
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 50 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoeventnotificationparam.h
View file

@ -19,7 +19,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
}; };
// FUNCTION: LEGO1 0x10028690 // FUNCTION: LEGO1 0x10028690
MxNotificationParam* Clone() override MxNotificationParam* Clone() const override
{ {
LegoEventNotificationParam* clone = LegoEventNotificationParam* clone =
new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key); new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);

2
LEGO1/lego/legoomni/include/legoomni.h
View file

@ -187,7 +187,7 @@ class LegoOmni : public MxOmni {
void DeleteObject(MxDSAction& p_dsAction) override; // vtable+24 void DeleteObject(MxDSAction& p_dsAction) override; // vtable+24
MxBool DoesEntityExist(MxDSAction& p_dsAction) override; // vtable+28 MxBool DoesEntityExist(MxDSAction& p_dsAction) override; // vtable+28
MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30 MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
void NotifyCurrentEntity(MxNotificationParam* p_param) override; // vtable+34 void NotifyCurrentEntity(const MxNotificationParam& p_param) override; // vtable+34
void StartTimer() override; // vtable+38 void StartTimer() override; // vtable+38
void StopTimer() override; // vtable+3c void StopTimer() override; // vtable+3c

2
LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
View file

@ -124,7 +124,7 @@ void LegoAnimMMPresenter::EndAction()
MxType18NotificationParam param(c_notificationType18, NULL, m_animmanId); MxType18NotificationParam param(c_notificationType18, NULL, m_animmanId);
if (m_animmanId != 0) { if (m_animmanId != 0) {
NotificationManager()->Send(AnimationManager(), &param); NotificationManager()->Send(AnimationManager(), param);
} }
if (m_action != NULL) { if (m_action != NULL) {

9
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View file

@ -775,14 +775,7 @@ inline void LoadIsle()
LegoWorld* world = FindWorld(*g_isleScript, 0); LegoWorld* world = FindWorld(*g_isleScript, 0);
if (world != NULL) { if (world != NULL) {
if (!world->GetUnknown0xd0().empty()) { if (!world->GetUnknown0xd0().empty()) {
#ifdef COMPAT_MODE NotificationManager()->Send(world, MxNotificationParam(c_notificationType20, NULL));
{
MxNotificationParam param(c_notificationType20, NULL);
NotificationManager()->Send(world, &param);
}
#else
NotificationManager()->Send(world, &MxNotificationParam(c_notificationType20, NULL));
#endif
} }
} }
else { else {

9
LEGO1/lego/legoomni/src/common/legoutils.cpp
View file

@ -239,14 +239,7 @@ void NotifyEntity(const char* p_filename, MxS32 p_entityId, LegoEntity* p_sender
} }
if (entity != NULL) { if (entity != NULL) {
#ifdef COMPAT_MODE NotificationManager()->Send(entity, MxNotificationParam(c_notificationType0, p_sender));
{
MxNotificationParam param(c_notificationType0, p_sender);
NotificationManager()->Send(entity, &param);
}
#else
NotificationManager()->Send(entity, &MxNotificationParam(c_notificationType0, p_sender));
#endif
} }
} }

9
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View file

@ -66,14 +66,7 @@ LegoWorldPresenter::~LegoWorldPresenter()
} }
if (m_entity) { if (m_entity) {
#ifdef COMPAT_MODE NotificationManager()->Send(m_entity, MxNotificationParam(c_notificationNewPresenter, NULL));
{
MxNotificationParam param(c_notificationNewPresenter, NULL);
NotificationManager()->Send(m_entity, &param);
}
#else
NotificationManager()->Send(m_entity, &MxNotificationParam(c_notificationNewPresenter, NULL));
#endif
} }
} }

2
LEGO1/lego/legoomni/src/main/legoomni.cpp
View file

@ -678,7 +678,7 @@ MxEntity* LegoOmni::AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter*
} }
// FUNCTION: LEGO1 0x1005b3a0 // FUNCTION: LEGO1 0x1005b3a0
void LegoOmni::NotifyCurrentEntity(MxNotificationParam* p_param) void LegoOmni::NotifyCurrentEntity(const MxNotificationParam& p_param)
{ {
if (m_currentWorld) { if (m_currentWorld) {
NotificationManager()->Send(m_currentWorld, p_param); NotificationManager()->Send(m_currentWorld, p_param);

53
LEGO1/lego/legoomni/src/worlds/isle.cpp
View file

@ -509,16 +509,7 @@ void Isle::Enable(MxBool p_enable)
switch (GameState()->m_currentArea) { switch (GameState()->m_currentArea) {
case LegoGameState::e_elevride: case LegoGameState::e_elevride:
m_destLocation = LegoGameState::e_elevride; m_destLocation = LegoGameState::e_elevride;
NotificationManager()->Send(this, MxNotificationParam(c_notificationTransitioned, NULL));
#ifdef COMPAT_MODE
{
MxNotificationParam param(c_notificationTransitioned, NULL);
NotificationManager()->Send(this, &param);
}
#else
NotificationManager()->Send(this, &MxNotificationParam(c_notificationTransitioned, NULL));
#endif
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
break; break;
case LegoGameState::e_jetrace2: case LegoGameState::e_jetrace2:
@ -540,30 +531,12 @@ void Isle::Enable(MxBool p_enable)
break; break;
case LegoGameState::e_garadoor: case LegoGameState::e_garadoor:
m_destLocation = LegoGameState::e_garadoor; m_destLocation = LegoGameState::e_garadoor;
NotificationManager()->Send(this, MxNotificationParam(c_notificationTransitioned, NULL));
#ifdef COMPAT_MODE
{
MxNotificationParam param(c_notificationTransitioned, NULL);
NotificationManager()->Send(this, &param);
}
#else
NotificationManager()->Send(this, &MxNotificationParam(c_notificationTransitioned, NULL));
#endif
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
break; break;
case LegoGameState::e_polidoor: case LegoGameState::e_polidoor:
m_destLocation = LegoGameState::e_polidoor; m_destLocation = LegoGameState::e_polidoor;
NotificationManager()->Send(this, MxNotificationParam(c_notificationTransitioned, NULL));
#ifdef COMPAT_MODE
{
MxNotificationParam param(c_notificationTransitioned, NULL);
NotificationManager()->Send(this, &param);
}
#else
NotificationManager()->Send(this, &MxNotificationParam(c_notificationTransitioned, NULL));
#endif
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
break; break;
case LegoGameState::e_bike: case LegoGameState::e_bike:
@ -1012,29 +985,13 @@ void Isle::FUN_10032d30(
m_act1state->m_unk0x01f = FALSE; m_act1state->m_unk0x01f = FALSE;
} }
else { else {
#ifdef COMPAT_MODE NotificationManager()->Send(this, MxNotificationParam(c_notificationTransitioned, NULL));
{
MxNotificationParam param(c_notificationTransitioned, NULL);
NotificationManager()->Send(this, &param);
}
#else
NotificationManager()->Send(this, &MxNotificationParam(c_notificationTransitioned, NULL));
#endif
} }
} }
else { else {
GameState()->SwitchArea(m_destLocation); GameState()->SwitchArea(m_destLocation);
GameState()->StopArea(LegoGameState::e_previousArea); GameState()->StopArea(LegoGameState::e_previousArea);
NotificationManager()->Send(this, MxNotificationParam(c_notificationTransitioned, NULL));
#ifdef COMPAT_MODE
{
MxNotificationParam param(c_notificationTransitioned, NULL);
NotificationManager()->Send(this, &param);
}
#else
NotificationManager()->Send(this, &MxNotificationParam(c_notificationTransitioned, NULL));
#endif
m_act1state->m_unk0x01f = TRUE; m_act1state->m_unk0x01f = TRUE;
} }
} }

8
LEGO1/omni/include/mxactionnotificationparam.h
View file

@ -47,7 +47,7 @@ class MxActionNotificationParam : public MxNotificationParam {
} }
// FUNCTION: LEGO1 0x100510c0 // FUNCTION: LEGO1 0x100510c0
MxNotificationParam* Clone() override MxNotificationParam* Clone() const override
{ {
return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc); return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
} // vtable+0x04 } // vtable+0x04
@ -73,7 +73,7 @@ class MxStartActionNotificationParam : public MxActionNotificationParam {
{ {
} }
MxNotificationParam* Clone() override; // vtable+0x04 MxNotificationParam* Clone() const override; // vtable+0x04
}; };
// VTABLE: LEGO1 0x100d8358 // VTABLE: LEGO1 0x100d8358
@ -91,7 +91,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
} }
// FUNCTION: LEGO1 0x10051270 // FUNCTION: LEGO1 0x10051270
MxNotificationParam* Clone() override MxNotificationParam* Clone() const override
{ {
return new MxEndActionNotificationParam( return new MxEndActionNotificationParam(
c_notificationEndAction, c_notificationEndAction,
@ -112,7 +112,7 @@ class MxType4NotificationParam : public MxActionNotificationParam {
m_unk0x14 = p_unk0x14; m_unk0x14 = p_unk0x14;
} }
MxNotificationParam* Clone() override; // vtable+0x04 MxNotificationParam* Clone() const override; // vtable+0x04
private: private:
MxPresenter* m_unk0x14; // 0x14 MxPresenter* m_unk0x14; // 0x14

4
LEGO1/omni/include/mxnotificationmanager.h
View file

@ -9,7 +9,7 @@
class MxNotification { class MxNotification {
public: public:
MxNotification(MxCore* p_target, MxNotificationParam* p_param); MxNotification(MxCore* p_target, const MxNotificationParam& p_param);
~MxNotification(); ~MxNotification();
inline MxCore* GetTarget() { return m_target; } inline MxCore* GetTarget() { return m_target; }
@ -43,7 +43,7 @@ class MxNotificationManager : public MxCore {
virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14 virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
void Register(MxCore* p_listener); void Register(MxCore* p_listener);
void Unregister(MxCore* p_listener); void Unregister(MxCore* p_listener);
MxResult Send(MxCore* p_listener, MxNotificationParam* p_param); MxResult Send(MxCore* p_listener, const MxNotificationParam& p_param);
inline MxNotificationPtrList* GetQueue() { return m_queue; } inline MxNotificationPtrList* GetQueue() { return m_queue; }
inline void SetActive(MxBool p_active) { m_active = p_active; } inline void SetActive(MxBool p_active) { m_active = p_active; }

2
LEGO1/omni/include/mxnotificationparam.h
View file

@ -42,7 +42,7 @@ class MxNotificationParam : public MxParam {
} }
// FUNCTION: LEGO1 0x10010390 // FUNCTION: LEGO1 0x10010390
virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04 virtual MxNotificationParam* Clone() const { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04
inline NotificationId GetNotification() const { return m_type; } inline NotificationId GetNotification() const { return m_type; }
inline MxCore* GetSender() const { return m_sender; } inline MxCore* GetSender() const { return m_sender; }

2
LEGO1/omni/include/mxomni.h
View file

@ -48,7 +48,7 @@ class MxOmni : public MxCore {
virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28 virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28
virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+2c virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+2c
virtual MxEntity* AddToWorld(const char*, MxS32, MxPresenter*); // vtable+30 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 StartTimer(); // vtable+38
virtual void StopTimer(); // vtable+3c virtual void StopTimer(); // vtable+3c

2
LEGO1/omni/include/mxstreamer.h
View file

@ -24,7 +24,7 @@ class MxStreamerNotification : public MxNotificationParam {
m_controller = p_ctrlr; m_controller = p_ctrlr;
} }
MxNotificationParam* Clone() override; MxNotificationParam* Clone() const override;
MxStreamController* GetController() { return m_controller; } MxStreamController* GetController() { return m_controller; }

2
LEGO1/omni/include/mxtype18notificationparam.h
View file

@ -14,7 +14,7 @@ class MxType18NotificationParam : public MxNotificationParam {
} }
// FUNCTION: LEGO1 0x1004afd0 // FUNCTION: LEGO1 0x1004afd0
MxNotificationParam* Clone() override MxNotificationParam* Clone() const override
{ {
return new MxType18NotificationParam(m_type, m_sender, m_unk0x0c); return new MxType18NotificationParam(m_type, m_sender, m_unk0x0c);
} // vtable+0x04 } // vtable+0x04

11
LEGO1/omni/src/common/mxcompositepresenter.cpp
View file

@ -96,17 +96,10 @@ void MxCompositePresenter::EndAction()
MxPresenter::EndAction(); MxPresenter::EndAction();
if (action && action->GetOrigin()) { if (action && action->GetOrigin()) {
#ifdef COMPAT_MODE
{
MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE);
NotificationManager()->Send(action->GetOrigin(), &param);
}
#else
NotificationManager()->Send( NotificationManager()->Send(
action->GetOrigin(), action->GetOrigin(),
&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE) MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
); );
#endif
} }
} }
@ -209,7 +202,7 @@ void MxCompositePresenter::VTable0x5c(MxNotificationParam& p_param)
} }
} }
NotificationManager()->Send(this, &p_param); NotificationManager()->Send(this, p_param);
} }
} }

9
LEGO1/omni/src/common/mxmediapresenter.cpp
View file

@ -154,17 +154,10 @@ void MxMediaPresenter::EndAction()
} }
if (action && action->GetOrigin()) { if (action && action->GetOrigin()) {
#ifdef COMPAT_MODE
{
MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE);
NotificationManager()->Send(action->GetOrigin(), &param);
}
#else
NotificationManager()->Send( NotificationManager()->Send(
action->GetOrigin(), action->GetOrigin(),
&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE) MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
); );
#endif
} }
} }
} }

19
LEGO1/omni/src/common/mxpresenter.cpp
View file

@ -58,16 +58,9 @@ void MxPresenter::EndAction()
AUTOLOCK(m_criticalSection); AUTOLOCK(m_criticalSection);
if (!this->m_compositePresenter) { if (!this->m_compositePresenter) {
#ifdef COMPAT_MODE
{
MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE);
MxOmni::GetInstance()->NotifyCurrentEntity(&param);
}
#else
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(
&MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE) MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE)
); );
#endif
} }
this->m_action = NULL; this->m_action = NULL;
@ -115,15 +108,7 @@ void MxPresenter::SendToCompositePresenter(MxOmni* p_omni)
if (m_compositePresenter) { if (m_compositePresenter) {
AUTOLOCK(m_criticalSection); AUTOLOCK(m_criticalSection);
#ifdef COMPAT_MODE NotificationManager()->Send(m_compositePresenter, MxNotificationParam(c_notificationPresenter, this));
{
MxNotificationParam param(c_notificationPresenter, this);
NotificationManager()->Send(m_compositePresenter, &param);
}
#else
NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(c_notificationPresenter, this));
#endif
m_action->SetOrigin(p_omni ? p_omni : MxOmni::GetInstance()); m_action->SetOrigin(p_omni ? p_omni : MxOmni::GetInstance());
m_compositePresenter = NULL; m_compositePresenter = NULL;
} }

20
LEGO1/omni/src/main/mxomni.cpp
View file

@ -42,7 +42,7 @@ MxEntity* MxOmni::AddToWorld(const char*, MxS32, MxPresenter*)
} }
// FUNCTION: LEGO1 0x100aefc0 // FUNCTION: LEGO1 0x100aefc0
void MxOmni::NotifyCurrentEntity(MxNotificationParam* p_param) void MxOmni::NotifyCurrentEntity(const MxNotificationParam& p_param)
{ {
} }
@ -269,28 +269,14 @@ MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p
if (object->StartAction(p_controller, &p_action) == SUCCESS) { if (object->StartAction(p_controller, &p_action) == SUCCESS) {
if (sender) { if (sender) {
#ifdef COMPAT_MODE NotificationManager()->Send(sender, MxType4NotificationParam(this, &p_action, object));
{
MxType4NotificationParam param(this, &p_action, object);
NotificationManager()->Send(sender, &param);
}
#else
NotificationManager()->Send(sender, &MxType4NotificationParam(this, &p_action, object));
#endif
} }
if (p_action.GetUnknown84()) { if (p_action.GetUnknown84()) {
#ifdef COMPAT_MODE
{
MxStartActionNotificationParam param(c_notificationStartAction, object, &p_action, FALSE);
NotificationManager()->Send(p_action.GetUnknown84(), &param);
}
#else
NotificationManager()->Send( NotificationManager()->Send(
p_action.GetUnknown84(), p_action.GetUnknown84(),
&MxStartActionNotificationParam(c_notificationStartAction, object, &p_action, FALSE) MxStartActionNotificationParam(c_notificationStartAction, object, &p_action, FALSE)
); );
#endif
} }
result = SUCCESS; result = SUCCESS;
} }

4
LEGO1/omni/src/notify/mxactionnotificationparam.cpp
View file

@ -4,7 +4,7 @@ DECOMP_SIZE_ASSERT(MxActionNotificationParam, 0x14)
DECOMP_SIZE_ASSERT(MxEndActionNotificationParam, 0x14) DECOMP_SIZE_ASSERT(MxEndActionNotificationParam, 0x14)
// FUNCTION: LEGO1 0x100b0300 // FUNCTION: LEGO1 0x100b0300
MxNotificationParam* MxStartActionNotificationParam::Clone() MxNotificationParam* MxStartActionNotificationParam::Clone() const
{ {
return new MxStartActionNotificationParam( return new MxStartActionNotificationParam(
c_notificationStartAction, c_notificationStartAction,
@ -15,7 +15,7 @@ MxNotificationParam* MxStartActionNotificationParam::Clone()
} }
// FUNCTION: LEGO1 0x100b04f0 // FUNCTION: LEGO1 0x100b04f0
MxNotificationParam* MxType4NotificationParam::Clone() MxNotificationParam* MxType4NotificationParam::Clone() const
{ {
return new MxType4NotificationParam(this->m_sender, this->m_action, this->m_unk0x14); return new MxType4NotificationParam(this->m_sender, this->m_action, this->m_unk0x14);
} }

14
LEGO1/omni/src/notify/mxnotificationmanager.cpp
View file

@ -12,10 +12,10 @@ DECOMP_SIZE_ASSERT(MxNotification, 0x08);
DECOMP_SIZE_ASSERT(MxNotificationManager, 0x40); DECOMP_SIZE_ASSERT(MxNotificationManager, 0x40);
// FUNCTION: LEGO1 0x100ac220 // FUNCTION: LEGO1 0x100ac220
MxNotification::MxNotification(MxCore* p_target, MxNotificationParam* p_param) MxNotification::MxNotification(MxCore* p_target, const MxNotificationParam& p_param)
{ {
m_target = p_target; m_target = p_target;
m_param = p_param->Clone(); m_param = p_param.Clone();
} }
// FUNCTION: LEGO1 0x100ac240 // FUNCTION: LEGO1 0x100ac240
@ -61,26 +61,24 @@ MxResult MxNotificationManager::Create(MxU32 p_frequencyMS, MxBool p_createThrea
} }
// FUNCTION: LEGO1 0x100ac6c0 // FUNCTION: LEGO1 0x100ac6c0
MxResult MxNotificationManager::Send(MxCore* p_listener, MxNotificationParam* p_param) MxResult MxNotificationManager::Send(MxCore* p_listener, const MxNotificationParam& p_param)
{ {
AUTOLOCK(m_lock); AUTOLOCK(m_lock);
if (m_active == FALSE) { if (!m_active) {
return FAILURE; return FAILURE;
} }
else {
MxIdList::iterator it = find(m_listenerIds.begin(), m_listenerIds.end(), p_listener->GetId()); MxIdList::iterator it = find(m_listenerIds.begin(), m_listenerIds.end(), p_listener->GetId());
if (it == m_listenerIds.end()) { if (it == m_listenerIds.end()) {
return FAILURE; return FAILURE;
} }
else {
MxNotification* notif = new MxNotification(p_listener, p_param); MxNotification* notif = new MxNotification(p_listener, p_param);
if (notif != NULL) { if (notif != NULL) {
m_queue->push_back(notif); m_queue->push_back(notif);
return SUCCESS; return SUCCESS;
} }
}
}
return FAILURE; return FAILURE;
} }

9
LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
View file

@ -334,16 +334,9 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
AUTOLOCK(m_criticalSection); AUTOLOCK(m_criticalSection);
if (m_unk0x54.Find(p_action, FALSE) == NULL) { if (m_unk0x54.Find(p_action, FALSE) == NULL) {
if (VTable0x30(p_action) == SUCCESS) { if (VTable0x30(p_action) == SUCCESS) {
#ifdef COMPAT_MODE
{
MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE);
MxOmni::GetInstance()->NotifyCurrentEntity(&param);
}
#else
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(
&MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE) MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE)
); );
#endif
} }
} }

20
LEGO1/omni/src/stream/mxstreamer.cpp
View file

@ -81,14 +81,7 @@ MxLong MxStreamer::Close(const char* p_name)
delete c; delete c;
} }
else { else {
#ifdef COMPAT_MODE NotificationManager()->Send(this, MxStreamerNotification(c_notificationStreamer, NULL, c));
{
MxStreamerNotification notification(c_notificationStreamer, NULL, c);
NotificationManager()->Send(this, &notification);
}
#else
NotificationManager()->Send(this, &MxStreamerNotification(c_notificationStreamer, NULL, c));
#endif
} }
return SUCCESS; return SUCCESS;
@ -99,7 +92,7 @@ MxLong MxStreamer::Close(const char* p_name)
} }
// FUNCTION: LEGO1 0x100b9700 // FUNCTION: LEGO1 0x100b9700
MxNotificationParam* MxStreamerNotification::Clone() MxNotificationParam* MxStreamerNotification::Clone() const
{ {
return new MxStreamerNotification(m_type, m_sender, m_controller); return new MxStreamerNotification(m_type, m_sender, m_controller);
} }
@ -204,14 +197,7 @@ MxLong MxStreamer::Notify(MxParam& p_param)
delete c; delete c;
} }
else { else {
#ifdef COMPAT_MODE NotificationManager()->Send(this, MxStreamerNotification(c_notificationStreamer, NULL, c));
{
MxStreamerNotification notification(c_notificationStreamer, NULL, c);
NotificationManager()->Send(this, &notification);
}
#else
NotificationManager()->Send(this, &MxStreamerNotification(c_notificationStreamer, NULL, c));
#endif
} }
} }