isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 11:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use COMPAT_MODE macro to fix errors with mingw gcc 12.2

Browse Source
This commit is contained in:
Anonymous Maarten 2024-01-06 19:59:41 +01:00
parent dc3500f631
commit f33372a539
10 changed files with 90 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ISLE/isleapp.cpp
View File

@ -132,9 +132,15 @@ BOOL IsleApp::SetupLegoOmni()
char mediaPath[256]; char mediaPath[256];
GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath)); GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath));
#ifdef COMPAT_MODE
MxOmniCreateParam param(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags());
BOOL failure = Lego()->Create(param) == FAILURE;
#else
BOOL failure = BOOL failure =
Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags()) Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags())
) == FAILURE; ) == FAILURE;
#endif
if (!failure) { if (!failure) {
VariableTable()->SetVariable("ACTOR_01", ""); VariableTable()->SetVariable("ACTOR_01", "");
TickleManager()->SetClientTickleInterval(VideoManager(), 10); TickleManager()->SetClientTickleInterval(VideoManager(), 10);

5
LEGO1/mxatomid.cpp
View File

@ -36,7 +36,12 @@ void MxAtomId::Destroy()
// The dtor is called on the counter object immediately, // The dtor is called on the counter object immediately,
// so this syntax should be correct. // so this syntax should be correct.
#ifdef COMPAT_MODE
MxAtomIdCounter id_counter(m_internal);
MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&id_counter);
#else
MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&MxAtomIdCounter(m_internal)); MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&MxAtomIdCounter(m_internal));
#endif
MxAtomIdCounter* counter = (MxAtomIdCounter*) (*it); MxAtomIdCounter* counter = (MxAtomIdCounter*) (*it);
counter->Dec(); counter->Dec();

8
LEGO1/mxcompositepresenter.cpp
View File

@ -97,10 +97,18 @@ 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
} }
} }

15
LEGO1/mxdiskstreamcontroller.cpp
View File

@ -23,8 +23,14 @@ MxDiskStreamController::~MxDiskStreamController()
m_unk0xc4 = FALSE; m_unk0xc4 = FALSE;
m_unk0x70 = FALSE; m_unk0x70 = FALSE;
if (m_provider) if (m_provider) {
#ifdef COMPAT_MODE
MxDSAction action;
m_provider->VTable0x20(&action);
#else
m_provider->VTable0x20(&MxDSAction()); m_provider->VTable0x20(&MxDSAction());
#endif
}
MxDSAction* action; MxDSAction* action;
while (m_unk0x3c.PopFront(action)) while (m_unk0x3c.PopFront(action))
@ -299,9 +305,16 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->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
} }
} }

8
LEGO1/mxmediapresenter.cpp
View File

@ -160,10 +160,18 @@ 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
} }
} }
} }

13
LEGO1/mxomni.cpp
View File

@ -345,14 +345,27 @@ 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
MxType4NotificationParam param(this, &p_action, object);
NotificationManager()->Send(sender, &param);
#else
NotificationManager()->Send(sender, &MxType4NotificationParam(this, &p_action, object)); 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;
} }

12
LEGO1/mxpresenter.cpp
View File

@ -147,9 +147,16 @@ void MxPresenter::EndAction()
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->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;
@ -195,7 +202,12 @@ void MxPresenter::SendToCompositePresenter(MxOmni* p_omni)
if (m_compositePresenter) { if (m_compositePresenter) {
MxAutoLocker lock(&m_criticalSection); MxAutoLocker lock(&m_criticalSection);
#ifdef COMPAT_MODE
MxNotificationParam param(MXPRESENTER_NOTIFICATION, this);
NotificationManager()->Send(m_compositePresenter, &param);
#else
NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(MXPRESENTER_NOTIFICATION, this)); NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(MXPRESENTER_NOTIFICATION, 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;

5
LEGO1/mxstreamcontroller.cpp
View File

@ -55,7 +55,12 @@ MxStreamController::~MxStreamController()
if (m_provider) { if (m_provider) {
MxStreamProvider* provider = m_provider; MxStreamProvider* provider = m_provider;
m_provider = NULL; m_provider = NULL;
#ifdef COMPAT_MODE
MxDSAction action;
provider->VTable0x20(&action);
#else
provider->VTable0x20(&MxDSAction()); provider->VTable0x20(&MxDSAction());
#endif
delete provider; delete provider;
} }

16
LEGO1/mxstreamer.cpp
View File

@ -81,8 +81,14 @@ MxLong MxStreamer::Close(const char* p_name)
if (c->FUN_100c20d0(ds)) if (c->FUN_100c20d0(ds))
delete c; delete c;
else else {
#ifdef COMPAT_MODE
MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
NotificationManager()->Send(this, &notification);
#else
NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
#endif
}
return SUCCESS; return SUCCESS;
} }
@ -185,8 +191,14 @@ MxLong MxStreamer::Notify(MxParam& p_param)
if (c->FUN_100c20d0(ds)) if (c->FUN_100c20d0(ds))
delete c; delete c;
else else {
#ifdef COMPAT_MODE
MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
NotificationManager()->Send(this, &notification);
#else
NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
#endif
}
} }
return 0; return 0;

5
LEGO1/mxtransitionmanager.cpp
View File

@ -140,7 +140,12 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
LegoWorld* world = GetCurrentWorld(); LegoWorld* world = GetCurrentWorld();
if (world) { if (world) {
#ifdef COMPAT_MODE
MxNotificationParam param(MXTRANSITIONMANAGER_TRANSITIONENDED, this);
world->Notify(param);
#else
world->Notify(MxNotificationParam(MXTRANSITIONMANAGER_TRANSITIONENDED, this)); world->Notify(MxNotificationParam(MXTRANSITIONMANAGER_TRANSITIONENDED, this));
#endif
} }
} }
} }