From 83186383826885f73f27b1952c729cb1a394bc92 Mon Sep 17 00:00:00 2001 From: Misha Date: Sat, 7 Oct 2023 12:07:14 -0400 Subject: [PATCH] Address review --- ISLE/isleapp.cpp | 4 ++-- LEGO1/legoomni.cpp | 4 ++-- LEGO1/legoomni.h | 3 +-- LEGO1/mxomni.cpp | 8 ++++---- LEGO1/mxomni.h | 2 +- LEGO1/mxstreamcontroller.cpp | 10 +++++----- LEGO1/mxstreamcontroller.h | 4 ++-- LEGO1/mxstreamer.cpp | 4 ++-- LEGO1/mxstreamer.h | 2 +- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index c20f1652..8b93da6c 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -732,14 +732,14 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame) ds.SetObjectId(0); VideoManager()->EnableFullScreenMovie(TRUE, TRUE); - if (Start(&ds) != SUCCESS) { + if (Start(ds) != SUCCESS) { return; } } else { ds.SetAtomId(stream->atom); ds.SetUnknown24(-1); ds.SetObjectId(0); - if (Start(&ds) != SUCCESS) { + if (Start(ds) != SUCCESS) { return; } this->m_gameStarted = 1; diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 05b9f574..4e32f290 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -100,9 +100,9 @@ void SetOmniUserMessage(void (*p_userMsg)(const char *,int)) } // OFFSET: LEGO1 0x100acf50 -MxLong Start(MxDSAction* action) +MxResult Start(MxDSAction& p_dsAction) { - return MxOmni::GetInstance()->Start(action); + return MxOmni::GetInstance()->Start(&p_dsAction); } // OFFSET: LEGO1 0x1005ad10 diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h index 4a5fe6e4..91c7b1a3 100644 --- a/LEGO1/legoomni.h +++ b/LEGO1/legoomni.h @@ -110,10 +110,9 @@ __declspec(dllexport) LegoEntity * PickEntity(MxLong,MxLong); __declspec(dllexport) LegoROI * PickROI(MxLong,MxLong); __declspec(dllexport) void SetOmniUserMessage(void (*)(const char *,int)); __declspec(dllexport) LegoSoundManager * SoundManager(); -__declspec(dllexport) MxLong Start(MxDSAction *); +__declspec(dllexport) MxResult Start(MxDSAction&); __declspec(dllexport) MxTransitionManager * TransitionManager(); __declspec(dllexport) LegoVideoManager * VideoManager(); -__declspec(dllexport) MxLong Start(MxDSAction *a); LegoBuildingManager* BuildingManager(); Isle* GetIsle(); diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index 6711386c..ed870b34 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -43,12 +43,12 @@ void MxOmni::Init() } // OFFSET: LEGO1 0x100b0090 -long MxOmni::Start(MxDSAction* ds) +MxResult MxOmni::Start(MxDSAction* p_dsAction) { - MxResult result = -1; - if(ds->GetAtomId().GetInternal() != NULL && ds->GetObjectId() != -1 && m_streamer != NULL) + MxResult result = FAILURE; + if(p_dsAction->GetAtomId().GetInternal() != NULL && p_dsAction->GetObjectId() != -1 && m_streamer != NULL) { - result = m_streamer->Unknown100b99b0(ds); + result = m_streamer->Unknown100b99b0(p_dsAction); } return result; diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h index 592ba2f6..9c7d6b0a 100644 --- a/LEGO1/mxomni.h +++ b/LEGO1/mxomni.h @@ -38,7 +38,7 @@ class MxOmni : public MxCore virtual void Init(); // vtable+14 virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p); // vtable+18 virtual void Destroy(); // vtable+1c - virtual MxResult Start(MxDSAction* ds); // vtable+20 + virtual MxResult Start(MxDSAction* p_dsAction); // vtable+20 virtual void DeleteObject(MxDSAction &ds); // vtable+24 virtual MxBool DoesEntityExist(MxDSAction &ds); // vtable+28 virtual void vtable0x2c(); // vtable+2c diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp index 40b1c936..d6beaa8b 100644 --- a/LEGO1/mxstreamcontroller.cpp +++ b/LEGO1/mxstreamcontroller.cpp @@ -32,20 +32,20 @@ MxResult MxStreamController::Open(const char *p_filename) } // OFFSET: LEGO1 0x100b9400 -undefined4 MxStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) +MxResult MxStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) { - return -1; + return FAILURE; } // OFFSET: LEGO1 0x100b9410 -undefined4 MxStreamController::vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2) +MxResult MxStreamController::vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2) { - return -1; + return FAILURE; } // OFFSET: LEGO1 0x100c1690 STUB long MxStreamController::vtable0x20(MxDSAction* action) { // TODO STUB - return -1; + return FAILURE; } diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h index 966bd97b..26a22d38 100644 --- a/LEGO1/mxstreamcontroller.h +++ b/LEGO1/mxstreamcontroller.h @@ -31,8 +31,8 @@ class MxStreamController : public MxCore } virtual MxResult Open(const char *p_filename); // vtable+0x14 - virtual undefined4 vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18 - virtual undefined4 vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c + virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18 + virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c virtual long vtable0x20(MxDSAction* action); //vtable+0x20 MxBool FUN_100c20d0(MxDSObject &p_obj); diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp index bea2d349..53d7303f 100644 --- a/LEGO1/mxstreamer.cpp +++ b/LEGO1/mxstreamer.cpp @@ -142,11 +142,11 @@ MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action) controller = GetOpenStream(p_action->GetAtomId().GetInternal()); if (controller == NULL) { - return -1; + return FAILURE; } return controller->vtable0x20(p_action); } - return -1; + return FAILURE; } // OFFSET: LEGO1 0x100b9b60 diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h index 444e2099..c900feb9 100644 --- a/LEGO1/mxstreamer.h +++ b/LEGO1/mxstreamer.h @@ -96,7 +96,7 @@ class MxStreamer : public MxCore MxResult AddStreamControllerToOpenList(MxStreamController *p_stream); - MxResult Unknown100b99b0(MxDSAction* p_action); + MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action); private: list m_openStreams; // 0x8