From 47cc915ddab06d154986e2f86a7a3703fe11c4ce Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 6 Jan 2024 17:09:52 -0500 Subject: [PATCH] Format --- LEGO1/mxatomid.cpp | 4 ++-- LEGO1/mxcompositepresenter.cpp | 5 +---- LEGO1/mxdiskstreamcontroller.cpp | 6 ++---- LEGO1/mxmediapresenter.cpp | 5 +---- LEGO1/mxpresenter.cpp | 6 ++---- LEGO1/mxstreamer.cpp | 4 ++-- LEGO1/tgl/d3drm/renderer.cpp | 7 ++++--- 7 files changed, 14 insertions(+), 23 deletions(-) diff --git a/LEGO1/mxatomid.cpp b/LEGO1/mxatomid.cpp index 6b614760..7dda0e68 100644 --- a/LEGO1/mxatomid.cpp +++ b/LEGO1/mxatomid.cpp @@ -34,8 +34,8 @@ void MxAtomId::Destroy() if (!AtomIdCounterSet()) return; - // The dtor is called on the counter object immediately, - // so this syntax should be correct. + // The dtor is called on the counter object immediately, + // so this syntax should be correct. #ifdef COMPAT_MODE MxAtomIdCounter id_counter(m_internal); MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&id_counter); diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp index a585b623..e4add9bc 100644 --- a/LEGO1/mxcompositepresenter.cpp +++ b/LEGO1/mxcompositepresenter.cpp @@ -99,10 +99,7 @@ void MxCompositePresenter::EndAction() if (action && action->GetOrigin()) { #ifdef COMPAT_MODE MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE); - NotificationManager()->Send( - action->GetOrigin(), - ¶m - ); + NotificationManager()->Send(action->GetOrigin(), ¶m); #else NotificationManager()->Send( action->GetOrigin(), diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp index 793f5586..ee27557f 100644 --- a/LEGO1/mxdiskstreamcontroller.cpp +++ b/LEGO1/mxdiskstreamcontroller.cpp @@ -30,7 +30,7 @@ MxDiskStreamController::~MxDiskStreamController() #else m_provider->VTable0x20(&MxDSAction()); #endif - } + } MxDSAction* action; while (m_unk0x3c.PopFront(action)) @@ -307,9 +307,7 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action) if (VTable0x30(p_action) == SUCCESS) { #ifdef COMPAT_MODE MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE); - MxOmni::GetInstance()->NotifyCurrentEntity( - ¶m - ); + MxOmni::GetInstance()->NotifyCurrentEntity(¶m); #else MxOmni::GetInstance()->NotifyCurrentEntity( &MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE) diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp index 87345299..1798bb60 100644 --- a/LEGO1/mxmediapresenter.cpp +++ b/LEGO1/mxmediapresenter.cpp @@ -162,10 +162,7 @@ void MxMediaPresenter::EndAction() if (action && action->GetOrigin()) { #ifdef COMPAT_MODE MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE); - NotificationManager()->Send( - action->GetOrigin(), - ¶m - ); + NotificationManager()->Send(action->GetOrigin(), ¶m); #else NotificationManager()->Send( action->GetOrigin(), diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp index 42d5c558..c69d978c 100644 --- a/LEGO1/mxpresenter.cpp +++ b/LEGO1/mxpresenter.cpp @@ -148,10 +148,8 @@ void MxPresenter::EndAction() if (!this->m_compositePresenter) { #ifdef COMPAT_MODE - MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE); - MxOmni::GetInstance()->NotifyCurrentEntity( - ¶m - ); + 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) diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp index c3f296bb..cf9fe46b 100644 --- a/LEGO1/mxstreamer.cpp +++ b/LEGO1/mxstreamer.cpp @@ -88,7 +88,7 @@ MxLong MxStreamer::Close(const char* p_name) #else NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); #endif - } + } return SUCCESS; } @@ -198,7 +198,7 @@ MxLong MxStreamer::Notify(MxParam& p_param) #else NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c)); #endif - } + } } return 0; diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp index cc58d335..4a8ca6c7 100644 --- a/LEGO1/tgl/d3drm/renderer.cpp +++ b/LEGO1/tgl/d3drm/renderer.cpp @@ -13,10 +13,11 @@ Renderer* Tgl::CreateRenderer() return renderer; } -namespace TglImpl { +namespace TglImpl +{ // GLOBAL: LEGO1 0x1010103c -IDirect3DRM2 *g_pD3DRM = NULL; -} +IDirect3DRM2* g_pD3DRM = NULL; +} // namespace TglImpl // Inlined only Result RendererImpl::Create()