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

Address review

Browse Source
This commit is contained in:
Misha 2023-10-07 12:07:14 -04:00
parent ab36a90602
commit 8318638382
9 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ISLE/isleapp.cpp
View File

@ -732,14 +732,14 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
ds.SetObjectId(0); ds.SetObjectId(0);
VideoManager()->EnableFullScreenMovie(TRUE, TRUE); VideoManager()->EnableFullScreenMovie(TRUE, TRUE);
if (Start(&ds) != SUCCESS) { if (Start(ds) != SUCCESS) {
return; return;
} }
} else { } else {
ds.SetAtomId(stream->atom); ds.SetAtomId(stream->atom);
ds.SetUnknown24(-1); ds.SetUnknown24(-1);
ds.SetObjectId(0); ds.SetObjectId(0);
if (Start(&ds) != SUCCESS) { if (Start(ds) != SUCCESS) {
return; return;
} }
this->m_gameStarted = 1; this->m_gameStarted = 1;

4
LEGO1/legoomni.cpp
View File

@ -100,9 +100,9 @@ void SetOmniUserMessage(void (*p_userMsg)(const char *,int))
} }
// OFFSET: LEGO1 0x100acf50 // 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 // OFFSET: LEGO1 0x1005ad10

3
LEGO1/legoomni.h
View File

@ -110,10 +110,9 @@ __declspec(dllexport) LegoEntity * PickEntity(MxLong,MxLong);
__declspec(dllexport) LegoROI * PickROI(MxLong,MxLong); __declspec(dllexport) LegoROI * PickROI(MxLong,MxLong);
__declspec(dllexport) void SetOmniUserMessage(void (*)(const char *,int)); __declspec(dllexport) void SetOmniUserMessage(void (*)(const char *,int));
__declspec(dllexport) LegoSoundManager * SoundManager(); __declspec(dllexport) LegoSoundManager * SoundManager();
__declspec(dllexport) MxLong Start(MxDSAction *); __declspec(dllexport) MxResult Start(MxDSAction&);
__declspec(dllexport) MxTransitionManager * TransitionManager(); __declspec(dllexport) MxTransitionManager * TransitionManager();
__declspec(dllexport) LegoVideoManager * VideoManager(); __declspec(dllexport) LegoVideoManager * VideoManager();
__declspec(dllexport) MxLong Start(MxDSAction *a);
LegoBuildingManager* BuildingManager(); LegoBuildingManager* BuildingManager();
Isle* GetIsle(); Isle* GetIsle();

8
LEGO1/mxomni.cpp
View File

@ -43,12 +43,12 @@ void MxOmni::Init()
} }
// OFFSET: LEGO1 0x100b0090 // OFFSET: LEGO1 0x100b0090
long MxOmni::Start(MxDSAction* ds) MxResult MxOmni::Start(MxDSAction* p_dsAction)
{ {
MxResult result = -1; MxResult result = FAILURE;
if(ds->GetAtomId().GetInternal() != NULL && ds->GetObjectId() != -1 && m_streamer != NULL) 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; return result;

2
LEGO1/mxomni.h
View File

@ -38,7 +38,7 @@ class MxOmni : public MxCore
virtual void Init(); // vtable+14 virtual void Init(); // vtable+14
virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p); // vtable+18 virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p); // vtable+18
virtual void Destroy(); // vtable+1c 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 void DeleteObject(MxDSAction &ds); // vtable+24
virtual MxBool DoesEntityExist(MxDSAction &ds); // vtable+28 virtual MxBool DoesEntityExist(MxDSAction &ds); // vtable+28
virtual void vtable0x2c(); // vtable+2c virtual void vtable0x2c(); // vtable+2c

10
LEGO1/mxstreamcontroller.cpp
View File

@ -32,20 +32,20 @@ MxResult MxStreamController::Open(const char *p_filename)
} }
// OFFSET: LEGO1 0x100b9400 // 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 // 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 // OFFSET: LEGO1 0x100c1690 STUB
long MxStreamController::vtable0x20(MxDSAction* action) long MxStreamController::vtable0x20(MxDSAction* action)
{ {
// TODO STUB // TODO STUB
return -1; return FAILURE;
} }

4
LEGO1/mxstreamcontroller.h
View File

@ -31,8 +31,8 @@ class MxStreamController : public MxCore
} }
virtual MxResult Open(const char *p_filename); // vtable+0x14 virtual MxResult Open(const char *p_filename); // vtable+0x14
virtual undefined4 vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18 virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18
virtual undefined4 vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c
virtual long vtable0x20(MxDSAction* action); //vtable+0x20 virtual long vtable0x20(MxDSAction* action); //vtable+0x20
MxBool FUN_100c20d0(MxDSObject &p_obj); MxBool FUN_100c20d0(MxDSObject &p_obj);

4
LEGO1/mxstreamer.cpp
View File

@ -142,11 +142,11 @@ MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action)
controller = GetOpenStream(p_action->GetAtomId().GetInternal()); controller = GetOpenStream(p_action->GetAtomId().GetInternal());
if (controller == NULL) if (controller == NULL)
{ {
return -1; return FAILURE;
} }
return controller->vtable0x20(p_action); return controller->vtable0x20(p_action);
} }
return -1; return FAILURE;
} }
// OFFSET: LEGO1 0x100b9b60 // OFFSET: LEGO1 0x100b9b60

2
LEGO1/mxstreamer.h
View File

@ -96,7 +96,7 @@ class MxStreamer : public MxCore
MxResult AddStreamControllerToOpenList(MxStreamController *p_stream); MxResult AddStreamControllerToOpenList(MxStreamController *p_stream);
MxResult Unknown100b99b0(MxDSAction* p_action); MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action);
private: private:
list<MxStreamController *> m_openStreams; // 0x8 list<MxStreamController *> m_openStreams; // 0x8