From dd72bcc6666225e879d2e0c523c4f98efb86d4f0 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 14 Jan 2024 16:49:11 -0500 Subject: [PATCH] Use names from 1996 sources (#437) --- .../legoomni/include/legoentitypresenter.h | 10 +++---- .../src/common/mxcompositemediapresenter.cpp | 8 +++--- .../src/entity/legoactorpresenter.cpp | 12 ++++----- .../src/entity/legoentitypresenter.cpp | 26 +++++++++---------- .../src/entity/legoworldpresenter.cpp | 24 ++++++++--------- .../legoomni/src/paths/legopathpresenter.cpp | 4 +-- .../src/video/legotexturepresenter.cpp | 4 +-- .../src/video/mxtransitionmanager.cpp | 2 +- LEGO1/omni/include/mxmediamanager.h | 12 ++++----- LEGO1/omni/include/mxpresenter.h | 2 +- LEGO1/omni/src/audio/mxmusicpresenter.cpp | 4 +-- LEGO1/omni/src/audio/mxsoundpresenter.cpp | 4 +-- LEGO1/omni/src/common/mxmediamanager.cpp | 4 +-- LEGO1/omni/src/common/mxpresenter.cpp | 2 +- LEGO1/omni/src/event/mxeventpresenter.cpp | 4 +-- LEGO1/omni/src/video/mxvideopresenter.cpp | 4 +-- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h index de6690ec..e3055991 100644 --- a/LEGO1/lego/legoomni/include/legoentitypresenter.h +++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h @@ -26,20 +26,20 @@ public: } virtual void ReadyTickle() override; // vtable+0x18 - virtual void RepeatingTickle(); // vtable+0x24 - virtual void ParseExtra(); // vtable+0x30 + virtual void RepeatingTickle() override; // vtable+0x24 + virtual void ParseExtra() override; // vtable+0x30 virtual void Destroy() override; // vtable+0x38 virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c virtual void Init(); // vtable+0x68 - virtual undefined4 SetBackend(LegoEntity* p_unk0x4c); // vtable+0x6c + virtual undefined4 SetEntity(LegoEntity* p_entity); // vtable+0x6c - void SetBackendLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up); + void SetEntityLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up); private: void Destroy(MxBool p_fromDestructor); protected: - LegoEntity* m_objectBackend; // 0x4c + LegoEntity* m_entity; // 0x4c }; #endif // LEGOENTITYPRESENTER_H diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp index 6b0a32ca..69c7dd70 100644 --- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp @@ -16,13 +16,13 @@ MxCompositeMediaPresenter::MxCompositeMediaPresenter() { m_unk0x4c = 0; m_unk0x4e = FALSE; - VideoManager()->AddPresenter(*this); + VideoManager()->RegisterPresenter(*this); } // FUNCTION: LEGO1 0x10074020 MxCompositeMediaPresenter::~MxCompositeMediaPresenter() { - VideoManager()->RemovePresenter(*this); + VideoManager()->UnregisterPresenter(*this); } // FUNCTION: LEGO1 0x10074090 @@ -58,9 +58,9 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller presenter->SetTickleState(TickleState_Idle); if (presenter->IsA("MxVideoPresenter")) - VideoManager()->RemovePresenter(*presenter); + VideoManager()->UnregisterPresenter(*presenter); else if (presenter->IsA("MxAudioPresenter")) - SoundManager()->RemovePresenter(*presenter); + SoundManager()->UnregisterPresenter(*presenter); success = TRUE; } diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp index be5e86cc..f6b6be7f 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp @@ -7,10 +7,10 @@ void LegoActorPresenter::ReadyTickle() { if (GetCurrentWorld()) { - m_objectBackend = (LegoEntity*) CreateEntityBackend("LegoActor"); - if (m_objectBackend) { - SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); - m_objectBackend->Create(*m_action); + m_entity = (LegoEntity*) CreateEntity("LegoActor"); + if (m_entity) { + SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); + m_entity->Create(*m_action); } ProgressTickleState(TickleState_Starting); } @@ -19,7 +19,7 @@ void LegoActorPresenter::ReadyTickle() // FUNCTION: LEGO1 0x10076c90 void LegoActorPresenter::StartingTickle() { - if (m_objectBackend->GetROI()) { + if (m_entity->GetROI()) { ProgressTickleState(TickleState_Streaming); ParseExtra(); } @@ -34,6 +34,6 @@ void LegoActorPresenter::ParseExtra() memcpy(buffer, extraData, m_action->GetExtraLength()); buffer[m_action->GetExtraLength()] = 0; - m_objectBackend->ParseAction(buffer); + m_entity->ParseAction(buffer); } } diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp index b7638b75..92554b35 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp @@ -15,7 +15,7 @@ LegoEntityPresenter::LegoEntityPresenter() // FUNCTION: LEGO1 0x100535c0 void LegoEntityPresenter::Init() { - m_objectBackend = 0; + m_entity = NULL; } // FUNCTION: LEGO1 0x100535d0 @@ -25,9 +25,9 @@ LegoEntityPresenter::~LegoEntityPresenter() } // FUNCTION: LEGO1 0x10053630 -undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend) +undefined4 LegoEntityPresenter::SetEntity(LegoEntity* p_entity) { - m_objectBackend = p_backend; + m_entity = p_entity; return 0; } @@ -35,7 +35,7 @@ undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend) void LegoEntityPresenter::Destroy(MxBool p_fromDestructor) { if (VideoManager()) { - VideoManager()->RemovePresenter(*this); + VideoManager()->UnregisterPresenter(*this); } Init(); @@ -53,7 +53,7 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS MxResult result = MxCompositePresenter::StartAction(p_controller, p_action); if (VideoManager()) { - VideoManager()->AddPresenter(*this); + VideoManager()->RegisterPresenter(*this); } return result; @@ -63,10 +63,10 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS void LegoEntityPresenter::ReadyTickle() { if (GetCurrentWorld()) { - m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoEntity"); - if (m_objectBackend) { - m_objectBackend->Create(*m_action); - m_objectBackend->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE); + m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoEntity"); + if (m_entity) { + m_entity->Create(*m_action); + m_entity->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE); ParseExtra(); } ProgressTickleState(TickleState_Starting); @@ -82,14 +82,14 @@ void LegoEntityPresenter::RepeatingTickle() } // FUNCTION: LEGO1 0x10053730 -void LegoEntityPresenter::SetBackendLocation( +void LegoEntityPresenter::SetEntityLocation( Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up ) { - if (m_objectBackend) { - m_objectBackend->SetLocation(p_location, p_direction, p_up, TRUE); + if (m_entity) { + m_entity->SetLocation(p_location, p_direction, p_up, TRUE); } } @@ -103,6 +103,6 @@ void LegoEntityPresenter::ParseExtra() data[len] = 0; len &= MAXWORD; - m_objectBackend->ParseAction(data); + m_entity->ParseAction(data); } } diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 5be1baa8..1becbad4 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -35,26 +35,26 @@ LegoWorldPresenter::LegoWorldPresenter() LegoWorldPresenter::~LegoWorldPresenter() { MxBool result = FALSE; - if (m_objectBackend) { - undefined4 world = ((LegoWorld*) m_objectBackend)->GetUnknown0xec(); + if (m_entity) { + undefined4 world = ((LegoWorld*) m_entity)->GetUnknown0xec(); PlantManager()->FUN_10026360(world); AnimationManager()->FUN_1005f720(world); BuildingManager()->FUN_1002fa00(); - result = ((LegoWorld*) m_objectBackend)->VTable0x5c(); + result = ((LegoWorld*) m_entity)->VTable0x5c(); } if (result == FALSE) { FUN_10015820(0, 7); } - if (m_objectBackend) { + if (m_entity) { #ifdef COMPAT_MODE { MxNotificationParam param(c_notificationNewPresenter, NULL); - NotificationManager()->Send(m_objectBackend, ¶m); + NotificationManager()->Send(m_entity, ¶m); } #else - NotificationManager()->Send(m_objectBackend, &MxNotificationParam(c_notificationNewPresenter, NULL)); + NotificationManager()->Send(m_entity, &MxNotificationParam(c_notificationNewPresenter, NULL)); #endif } } @@ -103,7 +103,7 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA delete presenter; } - VideoManager()->AddPresenter(*this); + VideoManager()->RegisterPresenter(*this); result = SUCCESS; } @@ -114,11 +114,11 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA // FUNCTION: LEGO1 0x10066a50 void LegoWorldPresenter::ReadyTickle() { - m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoWorld"); - if (m_objectBackend) { - m_objectBackend->Create(*m_action); - Lego()->AddWorld((LegoWorld*) m_objectBackend); - SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); + m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoWorld"); + if (m_entity) { + m_entity->Create(*m_action); + Lego()->AddWorld((LegoWorld*) m_entity); + SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); } ParseExtra(); diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index 1c9b586f..b77a832c 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -29,7 +29,7 @@ MxResult LegoPathPresenter::AddToManager() MxResult status = FAILURE; if (VideoManager()) { - VideoManager()->AddPresenter(*this); + VideoManager()->RegisterPresenter(*this); status = SUCCESS; } @@ -40,7 +40,7 @@ MxResult LegoPathPresenter::AddToManager() void LegoPathPresenter::Destroy(MxBool p_fromDestructor) { if (VideoManager()) - VideoManager()->RemovePresenter(*this); + VideoManager()->UnregisterPresenter(*this); { MxAutoLocker lock(&this->m_criticalSection); diff --git a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp index 6d0cbe8c..60a0e81d 100644 --- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp @@ -7,13 +7,13 @@ // FUNCTION: LEGO1 0x1004eb40 LegoTexturePresenter::~LegoTexturePresenter() { - VideoManager()->RemovePresenter(*this); + VideoManager()->UnregisterPresenter(*this); } // FUNCTION: LEGO1 0x1004ebb0 MxResult LegoTexturePresenter::AddToManager() { - VideoManager()->AddPresenter(*this); + VideoManager()->RegisterPresenter(*this); return SUCCESS; } diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp index 734b4eae..3cb088ca 100644 --- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp +++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp @@ -486,7 +486,7 @@ void MxTransitionManager::SetWaitIndicator(MxVideoPresenter* p_waitIndicator) m_waitIndicator = p_waitIndicator; LegoVideoManager* videoManager = VideoManager(); - videoManager->RemovePresenter(*m_waitIndicator); + videoManager->UnregisterPresenter(*m_waitIndicator); if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::TickleState_Streaming) { m_waitIndicator->Tickle(); diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h index 47f7f0d1..1f2e31af 100644 --- a/LEGO1/omni/include/mxmediamanager.h +++ b/LEGO1/omni/include/mxmediamanager.h @@ -14,12 +14,12 @@ public: MxMediaManager(); virtual ~MxMediaManager() override; - virtual MxResult Tickle() override; // vtable+08 - virtual MxResult InitPresenters(); // vtable+14 - virtual void Destroy(); // vtable+18 - virtual void AddPresenter(MxPresenter& p_presenter); // vtable+1c - virtual void RemovePresenter(MxPresenter& p_presenter); // vtable+20 - virtual void StopPresenters(); // vtable+24 + virtual MxResult Tickle() override; // vtable+08 + virtual MxResult InitPresenters(); // vtable+14 + virtual void Destroy(); // vtable+18 + virtual void RegisterPresenter(MxPresenter& p_presenter); // vtable+1c + virtual void UnregisterPresenter(MxPresenter& p_presenter); // vtable+20 + virtual void StopPresenters(); // vtable+24 MxResult Init(); diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h index 27c40745..55682f11 100644 --- a/LEGO1/omni/include/mxpresenter.h +++ b/LEGO1/omni/include/mxpresenter.h @@ -115,7 +115,7 @@ public: __declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54 - MxEntity* CreateEntityBackend(const char* p_name); + MxEntity* CreateEntity(const char* p_name); MxBool IsEnabled(); inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; } diff --git a/LEGO1/omni/src/audio/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp index dc2f4b7f..437cd52d 100644 --- a/LEGO1/omni/src/audio/mxmusicpresenter.cpp +++ b/LEGO1/omni/src/audio/mxmusicpresenter.cpp @@ -27,7 +27,7 @@ void MxMusicPresenter::Init() void MxMusicPresenter::Destroy(MxBool p_fromDestructor) { if (MusicManager()) { - MusicManager()->RemovePresenter(*this); + MusicManager()->UnregisterPresenter(*this); } m_criticalSection.Enter(); @@ -46,7 +46,7 @@ MxResult MxMusicPresenter::AddToManager() if (MusicManager()) { result = SUCCESS; - MusicManager()->AddPresenter(*this); + MusicManager()->RegisterPresenter(*this); } return result; diff --git a/LEGO1/omni/src/audio/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp index 07e4a022..b0376331 100644 --- a/LEGO1/omni/src/audio/mxsoundpresenter.cpp +++ b/LEGO1/omni/src/audio/mxsoundpresenter.cpp @@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54) void MxSoundPresenter::Destroy(MxBool p_fromDestructor) { if (MSoundManager()) - MSoundManager()->RemovePresenter(*this); + MSoundManager()->UnregisterPresenter(*this); this->m_criticalSection.Enter(); MxMediaPresenter::Init(); @@ -26,7 +26,7 @@ MxResult MxSoundPresenter::AddToManager() if (MSoundManager()) { ret = SUCCESS; - MSoundManager()->AddPresenter(*this); + MSoundManager()->RegisterPresenter(*this); } return ret; diff --git a/LEGO1/omni/src/common/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp index e9b4fe6d..778d7f86 100644 --- a/LEGO1/omni/src/common/mxmediamanager.cpp +++ b/LEGO1/omni/src/common/mxmediamanager.cpp @@ -75,7 +75,7 @@ MxResult MxMediaManager::Tickle() } // FUNCTION: LEGO1 0x100b88c0 -void MxMediaManager::AddPresenter(MxPresenter& p_presenter) +void MxMediaManager::RegisterPresenter(MxPresenter& p_presenter) { MxAutoLocker lock(&this->m_criticalSection); @@ -83,7 +83,7 @@ void MxMediaManager::AddPresenter(MxPresenter& p_presenter) } // FUNCTION: LEGO1 0x100b8980 -void MxMediaManager::RemovePresenter(MxPresenter& p_presenter) +void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter) { MxAutoLocker lock(&this->m_criticalSection); MxPresenterListCursor cursor(this->m_presenters); diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index 6d025394..97641c91 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -229,7 +229,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action) } // FUNCTION: LEGO1 0x100b5410 -MxEntity* MxPresenter::CreateEntityBackend(const char* p_name) +MxEntity* MxPresenter::CreateEntity(const char* p_name) { char buffer[512]; char buffer2[512]; diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp index 213304ad..010ef589 100644 --- a/LEGO1/omni/src/event/mxeventpresenter.cpp +++ b/LEGO1/omni/src/event/mxeventpresenter.cpp @@ -33,7 +33,7 @@ MxResult MxEventPresenter::AddToManager() if (EventManager()) { ret = SUCCESS; - EventManager()->AddPresenter(*this); + EventManager()->RegisterPresenter(*this); } return ret; @@ -43,7 +43,7 @@ MxResult MxEventPresenter::AddToManager() void MxEventPresenter::Destroy() { if (EventManager()) - EventManager()->RemovePresenter(*this); + EventManager()->UnregisterPresenter(*this); m_criticalSection.Enter(); diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp index c098449a..84a59121 100644 --- a/LEGO1/omni/src/video/mxvideopresenter.cpp +++ b/LEGO1/omni/src/video/mxvideopresenter.cpp @@ -133,7 +133,7 @@ void MxVideoPresenter::Init() void MxVideoPresenter::Destroy(MxBool p_fromDestructor) { if (MVideoManager() != NULL) - MVideoManager()->RemovePresenter(*this); + MVideoManager()->UnregisterPresenter(*this); if (m_unk0x58) { m_unk0x58->Release(); @@ -504,7 +504,7 @@ MxResult MxVideoPresenter::AddToManager() if (MVideoManager()) { result = SUCCESS; - MVideoManager()->AddPresenter(*this); + MVideoManager()->RegisterPresenter(*this); } return result;