mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases 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
22 changed files with 50 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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