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

Format

Browse Source
This commit is contained in:
Christian Semmler 2024-01-06 17:09:52 -05:00
parent da675e3e29
commit 47cc915dda
7 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/mxatomid.cpp
View File

@ -34,8 +34,8 @@ void MxAtomId::Destroy()
if (!AtomIdCounterSet()) if (!AtomIdCounterSet())
return; return;
// 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 #ifdef COMPAT_MODE
MxAtomIdCounter id_counter(m_internal); MxAtomIdCounter id_counter(m_internal);
MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&id_counter); MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&id_counter);

5
LEGO1/mxcompositepresenter.cpp
View File

@ -99,10 +99,7 @@ void MxCompositePresenter::EndAction()
if (action && action->GetOrigin()) { if (action && action->GetOrigin()) {
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE); MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE);
NotificationManager()->Send( NotificationManager()->Send(action->GetOrigin(), &param);
action->GetOrigin(),
&param
);
#else #else
NotificationManager()->Send( NotificationManager()->Send(
action->GetOrigin(), action->GetOrigin(),

6
LEGO1/mxdiskstreamcontroller.cpp
View File

@ -30,7 +30,7 @@ MxDiskStreamController::~MxDiskStreamController()
#else #else
m_provider->VTable0x20(&MxDSAction()); m_provider->VTable0x20(&MxDSAction());
#endif #endif
} }
MxDSAction* action; MxDSAction* action;
while (m_unk0x3c.PopFront(action)) while (m_unk0x3c.PopFront(action))
@ -307,9 +307,7 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
if (VTable0x30(p_action) == SUCCESS) { if (VTable0x30(p_action) == SUCCESS) {
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE); MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE);
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(&param);
&param
);
#else #else
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(
&MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE) &MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE)

5
LEGO1/mxmediapresenter.cpp
View File

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

6
LEGO1/mxpresenter.cpp
View File

@ -148,10 +148,8 @@ void MxPresenter::EndAction()
if (!this->m_compositePresenter) { if (!this->m_compositePresenter) {
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE); MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE);
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(&param);
&param
);
#else #else
MxOmni::GetInstance()->NotifyCurrentEntity( MxOmni::GetInstance()->NotifyCurrentEntity(
&MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE) &MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE)

4
LEGO1/mxstreamer.cpp
View File

@ -88,7 +88,7 @@ MxLong MxStreamer::Close(const char* p_name)
#else #else
NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
#endif #endif
} }
return SUCCESS; return SUCCESS;
} }
@ -198,7 +198,7 @@ MxLong MxStreamer::Notify(MxParam& p_param)
#else #else
NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
#endif #endif
} }
} }
return 0; return 0;

7
LEGO1/tgl/d3drm/renderer.cpp
View File

@ -13,10 +13,11 @@ Renderer* Tgl::CreateRenderer()
return renderer; return renderer;
} }
namespace TglImpl { namespace TglImpl
{
// GLOBAL: LEGO1 0x1010103c // GLOBAL: LEGO1 0x1010103c
IDirect3DRM2 *g_pD3DRM = NULL; IDirect3DRM2* g_pD3DRM = NULL;
} } // namespace TglImpl
// Inlined only // Inlined only
Result RendererImpl::Create() Result RendererImpl::Create()