isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-29 19:16:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use names from 1996 sources (#437)

Browse source
This commit is contained in:
Christian Semmler 2024-01-14 16:49:11 -05:00 committed by GitHub
parent 7e9d3bde65
commit dd72bcc666
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/legoentitypresenter.h
View file

@ -26,20 +26,20 @@ class LegoEntityPresenter : public MxCompositePresenter {
} }
virtual void ReadyTickle() override; // vtable+0x18 virtual void ReadyTickle() override; // vtable+0x18
virtual void RepeatingTickle(); // vtable+0x24 virtual void RepeatingTickle() override; // vtable+0x24
virtual void ParseExtra(); // vtable+0x30 virtual void ParseExtra() override; // vtable+0x30
virtual void Destroy() override; // vtable+0x38 virtual void Destroy() override; // vtable+0x38
virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
virtual void Init(); // vtable+0x68 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: private:
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
protected: protected:
LegoEntity* m_objectBackend; // 0x4c LegoEntity* m_entity; // 0x4c
}; };
#endif // LEGOENTITYPRESENTER_H #endif // LEGOENTITYPRESENTER_H

8
LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
View file

@ -16,13 +16,13 @@ MxCompositeMediaPresenter::MxCompositeMediaPresenter()
{ {
m_unk0x4c = 0; m_unk0x4c = 0;
m_unk0x4e = FALSE; m_unk0x4e = FALSE;
VideoManager()->AddPresenter(*this); VideoManager()->RegisterPresenter(*this);
} }
// FUNCTION: LEGO1 0x10074020 // FUNCTION: LEGO1 0x10074020
MxCompositeMediaPresenter::~MxCompositeMediaPresenter() MxCompositeMediaPresenter::~MxCompositeMediaPresenter()
{ {
VideoManager()->RemovePresenter(*this); VideoManager()->UnregisterPresenter(*this);
} }
// FUNCTION: LEGO1 0x10074090 // FUNCTION: LEGO1 0x10074090
@ -58,9 +58,9 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
presenter->SetTickleState(TickleState_Idle); presenter->SetTickleState(TickleState_Idle);
if (presenter->IsA("MxVideoPresenter")) if (presenter->IsA("MxVideoPresenter"))
VideoManager()->RemovePresenter(*presenter); VideoManager()->UnregisterPresenter(*presenter);
else if (presenter->IsA("MxAudioPresenter")) else if (presenter->IsA("MxAudioPresenter"))
SoundManager()->RemovePresenter(*presenter); SoundManager()->UnregisterPresenter(*presenter);
success = TRUE; success = TRUE;
} }

12
LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
View file

@ -7,10 +7,10 @@
void LegoActorPresenter::ReadyTickle() void LegoActorPresenter::ReadyTickle()
{ {
if (GetCurrentWorld()) { if (GetCurrentWorld()) {
m_objectBackend = (LegoEntity*) CreateEntityBackend("LegoActor"); m_entity = (LegoEntity*) CreateEntity("LegoActor");
if (m_objectBackend) { if (m_entity) {
SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
m_objectBackend->Create(*m_action); m_entity->Create(*m_action);
} }
ProgressTickleState(TickleState_Starting); ProgressTickleState(TickleState_Starting);
} }
@ -19,7 +19,7 @@ void LegoActorPresenter::ReadyTickle()
// FUNCTION: LEGO1 0x10076c90 // FUNCTION: LEGO1 0x10076c90
void LegoActorPresenter::StartingTickle() void LegoActorPresenter::StartingTickle()
{ {
if (m_objectBackend->GetROI()) { if (m_entity->GetROI()) {
ProgressTickleState(TickleState_Streaming); ProgressTickleState(TickleState_Streaming);
ParseExtra(); ParseExtra();
} }
@ -34,6 +34,6 @@ void LegoActorPresenter::ParseExtra()
memcpy(buffer, extraData, m_action->GetExtraLength()); memcpy(buffer, extraData, m_action->GetExtraLength());
buffer[m_action->GetExtraLength()] = 0; buffer[m_action->GetExtraLength()] = 0;
m_objectBackend->ParseAction(buffer); m_entity->ParseAction(buffer);
} }
} }

26
LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
View file

@ -15,7 +15,7 @@ LegoEntityPresenter::LegoEntityPresenter()
// FUNCTION: LEGO1 0x100535c0 // FUNCTION: LEGO1 0x100535c0
void LegoEntityPresenter::Init() void LegoEntityPresenter::Init()
{ {
m_objectBackend = 0; m_entity = NULL;
} }
// FUNCTION: LEGO1 0x100535d0 // FUNCTION: LEGO1 0x100535d0
@ -25,9 +25,9 @@ LegoEntityPresenter::~LegoEntityPresenter()
} }
// FUNCTION: LEGO1 0x10053630 // 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; return 0;
} }
@ -35,7 +35,7 @@ undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend)
void LegoEntityPresenter::Destroy(MxBool p_fromDestructor) void LegoEntityPresenter::Destroy(MxBool p_fromDestructor)
{ {
if (VideoManager()) { if (VideoManager()) {
VideoManager()->RemovePresenter(*this); VideoManager()->UnregisterPresenter(*this);
} }
Init(); Init();
@ -53,7 +53,7 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS
MxResult result = MxCompositePresenter::StartAction(p_controller, p_action); MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
if (VideoManager()) { if (VideoManager()) {
VideoManager()->AddPresenter(*this); VideoManager()->RegisterPresenter(*this);
} }
return result; return result;
@ -63,10 +63,10 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS
void LegoEntityPresenter::ReadyTickle() void LegoEntityPresenter::ReadyTickle()
{ {
if (GetCurrentWorld()) { if (GetCurrentWorld()) {
m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoEntity"); m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoEntity");
if (m_objectBackend) { if (m_entity) {
m_objectBackend->Create(*m_action); m_entity->Create(*m_action);
m_objectBackend->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE); m_entity->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
ParseExtra(); ParseExtra();
} }
ProgressTickleState(TickleState_Starting); ProgressTickleState(TickleState_Starting);
@ -82,14 +82,14 @@ void LegoEntityPresenter::RepeatingTickle()
} }
// FUNCTION: LEGO1 0x10053730 // FUNCTION: LEGO1 0x10053730
void LegoEntityPresenter::SetBackendLocation( void LegoEntityPresenter::SetEntityLocation(
Mx3DPointFloat& p_location, Mx3DPointFloat& p_location,
Mx3DPointFloat& p_direction, Mx3DPointFloat& p_direction,
Mx3DPointFloat& p_up Mx3DPointFloat& p_up
) )
{ {
if (m_objectBackend) { if (m_entity) {
m_objectBackend->SetLocation(p_location, p_direction, p_up, TRUE); m_entity->SetLocation(p_location, p_direction, p_up, TRUE);
} }
} }
@ -103,6 +103,6 @@ void LegoEntityPresenter::ParseExtra()
data[len] = 0; data[len] = 0;
len &= MAXWORD; len &= MAXWORD;
m_objectBackend->ParseAction(data); m_entity->ParseAction(data);
} }
} }

24
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View file

@ -35,26 +35,26 @@ LegoWorldPresenter::LegoWorldPresenter()
LegoWorldPresenter::~LegoWorldPresenter() LegoWorldPresenter::~LegoWorldPresenter()
{ {
MxBool result = FALSE; MxBool result = FALSE;
if (m_objectBackend) { if (m_entity) {
undefined4 world = ((LegoWorld*) m_objectBackend)->GetUnknown0xec(); undefined4 world = ((LegoWorld*) m_entity)->GetUnknown0xec();
PlantManager()->FUN_10026360(world); PlantManager()->FUN_10026360(world);
AnimationManager()->FUN_1005f720(world); AnimationManager()->FUN_1005f720(world);
BuildingManager()->FUN_1002fa00(); BuildingManager()->FUN_1002fa00();
result = ((LegoWorld*) m_objectBackend)->VTable0x5c(); result = ((LegoWorld*) m_entity)->VTable0x5c();
} }
if (result == FALSE) { if (result == FALSE) {
FUN_10015820(0, 7); FUN_10015820(0, 7);
} }
if (m_objectBackend) { if (m_entity) {
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
{ {
MxNotificationParam param(c_notificationNewPresenter, NULL); MxNotificationParam param(c_notificationNewPresenter, NULL);
NotificationManager()->Send(m_objectBackend, &param); NotificationManager()->Send(m_entity, &param);
} }
#else #else
NotificationManager()->Send(m_objectBackend, &MxNotificationParam(c_notificationNewPresenter, NULL)); NotificationManager()->Send(m_entity, &MxNotificationParam(c_notificationNewPresenter, NULL));
#endif #endif
} }
} }
@ -103,7 +103,7 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
delete presenter; delete presenter;
} }
VideoManager()->AddPresenter(*this); VideoManager()->RegisterPresenter(*this);
result = SUCCESS; result = SUCCESS;
} }
@ -114,11 +114,11 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
// FUNCTION: LEGO1 0x10066a50 // FUNCTION: LEGO1 0x10066a50
void LegoWorldPresenter::ReadyTickle() void LegoWorldPresenter::ReadyTickle()
{ {
m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoWorld"); m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoWorld");
if (m_objectBackend) { if (m_entity) {
m_objectBackend->Create(*m_action); m_entity->Create(*m_action);
Lego()->AddWorld((LegoWorld*) m_objectBackend); Lego()->AddWorld((LegoWorld*) m_entity);
SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp()); SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
} }
ParseExtra(); ParseExtra();

4
LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
View file

@ -29,7 +29,7 @@ MxResult LegoPathPresenter::AddToManager()
MxResult status = FAILURE; MxResult status = FAILURE;
if (VideoManager()) { if (VideoManager()) {
VideoManager()->AddPresenter(*this); VideoManager()->RegisterPresenter(*this);
status = SUCCESS; status = SUCCESS;
} }
@ -40,7 +40,7 @@ MxResult LegoPathPresenter::AddToManager()
void LegoPathPresenter::Destroy(MxBool p_fromDestructor) void LegoPathPresenter::Destroy(MxBool p_fromDestructor)
{ {
if (VideoManager()) if (VideoManager())
VideoManager()->RemovePresenter(*this); VideoManager()->UnregisterPresenter(*this);
{ {
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->m_criticalSection);

4
LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
View file

@ -7,13 +7,13 @@
// FUNCTION: LEGO1 0x1004eb40 // FUNCTION: LEGO1 0x1004eb40
LegoTexturePresenter::~LegoTexturePresenter() LegoTexturePresenter::~LegoTexturePresenter()
{ {
VideoManager()->RemovePresenter(*this); VideoManager()->UnregisterPresenter(*this);
} }
// FUNCTION: LEGO1 0x1004ebb0 // FUNCTION: LEGO1 0x1004ebb0
MxResult LegoTexturePresenter::AddToManager() MxResult LegoTexturePresenter::AddToManager()
{ {
VideoManager()->AddPresenter(*this); VideoManager()->RegisterPresenter(*this);
return SUCCESS; return SUCCESS;
} }

2
LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
View file

@ -486,7 +486,7 @@ void MxTransitionManager::SetWaitIndicator(MxVideoPresenter* p_waitIndicator)
m_waitIndicator = p_waitIndicator; m_waitIndicator = p_waitIndicator;
LegoVideoManager* videoManager = VideoManager(); LegoVideoManager* videoManager = VideoManager();
videoManager->RemovePresenter(*m_waitIndicator); videoManager->UnregisterPresenter(*m_waitIndicator);
if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::TickleState_Streaming) { if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::TickleState_Streaming) {
m_waitIndicator->Tickle(); m_waitIndicator->Tickle();

12
LEGO1/omni/include/mxmediamanager.h
View file

@ -14,12 +14,12 @@ class MxMediaManager : public MxCore {
MxMediaManager(); MxMediaManager();
virtual ~MxMediaManager() override; virtual ~MxMediaManager() override;
virtual MxResult Tickle() override; // vtable+08 virtual MxResult Tickle() override; // vtable+08
virtual MxResult InitPresenters(); // vtable+14 virtual MxResult InitPresenters(); // vtable+14
virtual void Destroy(); // vtable+18 virtual void Destroy(); // vtable+18
virtual void AddPresenter(MxPresenter& p_presenter); // vtable+1c virtual void RegisterPresenter(MxPresenter& p_presenter); // vtable+1c
virtual void RemovePresenter(MxPresenter& p_presenter); // vtable+20 virtual void UnregisterPresenter(MxPresenter& p_presenter); // vtable+20
virtual void StopPresenters(); // vtable+24 virtual void StopPresenters(); // vtable+24
MxResult Init(); MxResult Init();

2
LEGO1/omni/include/mxpresenter.h
View file

@ -115,7 +115,7 @@ class MxPresenter : public MxCore {
__declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54 __declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54
MxEntity* CreateEntityBackend(const char* p_name); MxEntity* CreateEntity(const char* p_name);
MxBool IsEnabled(); MxBool IsEnabled();
inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; } inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }

4
LEGO1/omni/src/audio/mxmusicpresenter.cpp
View file

@ -27,7 +27,7 @@ void MxMusicPresenter::Init()
void MxMusicPresenter::Destroy(MxBool p_fromDestructor) void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
{ {
if (MusicManager()) { if (MusicManager()) {
MusicManager()->RemovePresenter(*this); MusicManager()->UnregisterPresenter(*this);
} }
m_criticalSection.Enter(); m_criticalSection.Enter();
@ -46,7 +46,7 @@ MxResult MxMusicPresenter::AddToManager()
if (MusicManager()) { if (MusicManager()) {
result = SUCCESS; result = SUCCESS;
MusicManager()->AddPresenter(*this); MusicManager()->RegisterPresenter(*this);
} }
return result; return result;

4
LEGO1/omni/src/audio/mxsoundpresenter.cpp
View file

@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)
void MxSoundPresenter::Destroy(MxBool p_fromDestructor) void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
{ {
if (MSoundManager()) if (MSoundManager())
MSoundManager()->RemovePresenter(*this); MSoundManager()->UnregisterPresenter(*this);
this->m_criticalSection.Enter(); this->m_criticalSection.Enter();
MxMediaPresenter::Init(); MxMediaPresenter::Init();
@ -26,7 +26,7 @@ MxResult MxSoundPresenter::AddToManager()
if (MSoundManager()) { if (MSoundManager()) {
ret = SUCCESS; ret = SUCCESS;
MSoundManager()->AddPresenter(*this); MSoundManager()->RegisterPresenter(*this);
} }
return ret; return ret;

4
LEGO1/omni/src/common/mxmediamanager.cpp
View file

@ -75,7 +75,7 @@ MxResult MxMediaManager::Tickle()
} }
// FUNCTION: LEGO1 0x100b88c0 // FUNCTION: LEGO1 0x100b88c0
void MxMediaManager::AddPresenter(MxPresenter& p_presenter) void MxMediaManager::RegisterPresenter(MxPresenter& p_presenter)
{ {
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->m_criticalSection);
@ -83,7 +83,7 @@ void MxMediaManager::AddPresenter(MxPresenter& p_presenter)
} }
// FUNCTION: LEGO1 0x100b8980 // FUNCTION: LEGO1 0x100b8980
void MxMediaManager::RemovePresenter(MxPresenter& p_presenter) void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter)
{ {
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->m_criticalSection);
MxPresenterListCursor cursor(this->m_presenters); MxPresenterListCursor cursor(this->m_presenters);

2
LEGO1/omni/src/common/mxpresenter.cpp
View file

@ -229,7 +229,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
} }
// FUNCTION: LEGO1 0x100b5410 // FUNCTION: LEGO1 0x100b5410
MxEntity* MxPresenter::CreateEntityBackend(const char* p_name) MxEntity* MxPresenter::CreateEntity(const char* p_name)
{ {
char buffer[512]; char buffer[512];
char buffer2[512]; char buffer2[512];

4
LEGO1/omni/src/event/mxeventpresenter.cpp
View file

@ -33,7 +33,7 @@ MxResult MxEventPresenter::AddToManager()
if (EventManager()) { if (EventManager()) {
ret = SUCCESS; ret = SUCCESS;
EventManager()->AddPresenter(*this); EventManager()->RegisterPresenter(*this);
} }
return ret; return ret;
@ -43,7 +43,7 @@ MxResult MxEventPresenter::AddToManager()
void MxEventPresenter::Destroy() void MxEventPresenter::Destroy()
{ {
if (EventManager()) if (EventManager())
EventManager()->RemovePresenter(*this); EventManager()->UnregisterPresenter(*this);
m_criticalSection.Enter(); m_criticalSection.Enter();

4
LEGO1/omni/src/video/mxvideopresenter.cpp
View file

@ -133,7 +133,7 @@ void MxVideoPresenter::Init()
void MxVideoPresenter::Destroy(MxBool p_fromDestructor) void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
{ {
if (MVideoManager() != NULL) if (MVideoManager() != NULL)
MVideoManager()->RemovePresenter(*this); MVideoManager()->UnregisterPresenter(*this);
if (m_unk0x58) { if (m_unk0x58) {
m_unk0x58->Release(); m_unk0x58->Release();
@ -504,7 +504,7 @@ MxResult MxVideoPresenter::AddToManager()
if (MVideoManager()) { if (MVideoManager()) {
result = SUCCESS; result = SUCCESS;
MVideoManager()->AddPresenter(*this); MVideoManager()->RegisterPresenter(*this);
} }
return result; return result;