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

implement a few mxomni/legoomni functions (#193)

Browse source
This commit is contained in:
Misha 2023-10-09 06:31:36 -04:00 committed by GitHub
parent 0db96ce2d6
commit 625ee52fe0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ISLE/isleapp.cpp
View file

@ -708,7 +708,7 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
} }
if (this->m_frameDelta + g_lastFrameTime < currentTime) { if (this->m_frameDelta + g_lastFrameTime < currentTime) {
if (!Lego()->vtable40()) { if (!Lego()->IsTimerRunning()) {
TickleManager()->Tickle(); TickleManager()->Tickle();
} }
g_lastFrameTime = currentTime; g_lastFrameTime = currentTime;

29
LEGO1/legoomni.cpp
View file

@ -6,7 +6,7 @@
#include "legoutil.h" #include "legoutil.h"
// 0x100f4588 // 0x100f4588
char *g_nocdSourceName = NULL; MxAtomId *g_nocdSourceName = NULL;
// 0x101020e8 // 0x101020e8
void (*g_omniUserMessage)(const char *,int); void (*g_omniUserMessage)(const char *,int);
@ -225,7 +225,7 @@ MxTransitionManager *TransitionManager()
// OFFSET: LEGO1 0x10053430 // OFFSET: LEGO1 0x10053430
const char *GetNoCD_SourceName() const char *GetNoCD_SourceName()
{ {
return g_nocdSourceName; return g_nocdSourceName->GetInternal();
} }
// OFFSET: LEGO1 0x1005b5f0 // OFFSET: LEGO1 0x1005b5f0
@ -252,7 +252,23 @@ LegoEntity *PickEntity(MxLong,MxLong)
// OFFSET: LEGO1 0x10058bd0 // OFFSET: LEGO1 0x10058bd0
void LegoOmni::Init() void LegoOmni::Init()
{ {
// FIXME: Stub MxOmni::Init();
m_unk68 = 0;
m_inputMgr = NULL;
m_unk6c = 0;
m_unk74 = 0;
m_unk78 = 0;
m_currentWorld = NULL;
m_unk80 = FALSE;
m_isle = NULL;
m_unk8c = 0;
m_plantManager = NULL;
m_gameState = NULL;
m_animationManager = NULL;
m_buildingManager = NULL;
m_bkgAudioManager = NULL;
m_unk13c = TRUE;
m_transitionManager = NULL;
} }
// OFFSET: LEGO1 0x10058e70 // OFFSET: LEGO1 0x10058e70
@ -266,6 +282,7 @@ MxResult LegoOmni::Create(COMPAT_CONST MxOmniCreateParam &p)
return SUCCESS; return SUCCESS;
} }
// OFFSET: LEGO1 0x10058c30 STUB
void LegoOmni::Destroy() void LegoOmni::Destroy()
{ {
// FIXME: Stub // FIXME: Stub
@ -322,12 +339,6 @@ void LegoOmni::StopTimer()
SetAppCursor(0); SetAppCursor(0);
} }
MxBool LegoOmni::vtable40()
{
// FIXME: Stub
return 0;
}
// OFFSET: LEGO1 0x100157a0 // OFFSET: LEGO1 0x100157a0
LegoWorld *GetCurrentWorld() LegoWorld *GetCurrentWorld()
{ {

11
LEGO1/legoomni.h
View file

@ -4,6 +4,7 @@
#include "compat.h" #include "compat.h"
#include "mxomni.h" #include "mxomni.h"
#include "mxdsaction.h" #include "mxdsaction.h"
#include "legoanimationmanager.h"
class Isle; class Isle;
class LegoBuildingManager; class LegoBuildingManager;
@ -62,7 +63,6 @@ class LegoOmni : public MxOmni
virtual void NotifyCurrentEntity() override; virtual void NotifyCurrentEntity() override;
virtual void StartTimer() override; virtual void StartTimer() override;
virtual void StopTimer() override; virtual void StopTimer() override;
virtual MxBool vtable40();
LegoVideoManager *GetVideoManager() { return (LegoVideoManager *) m_videoManager; } LegoVideoManager *GetVideoManager() { return (LegoVideoManager *) m_videoManager; }
LegoSoundManager *GetSoundManager() { return (LegoSoundManager *)m_soundManager;} LegoSoundManager *GetSoundManager() { return (LegoSoundManager *)m_soundManager;}
@ -83,19 +83,18 @@ class LegoOmni : public MxOmni
undefined4 m_unk74; undefined4 m_unk74;
undefined4 m_unk78; undefined4 m_unk78;
LegoWorld *m_currentWorld; LegoWorld *m_currentWorld;
undefined4 m_unk80; MxBool m_unk80;
LegoNavController *m_navController; // 0x84 LegoNavController *m_navController; // 0x84
Isle* m_isle; // 0x88 Isle* m_isle; // 0x88
char m_unk8c[0x4]; undefined4 m_unk8c;
LegoPlantManager* m_plantManager; // 0x90 LegoPlantManager* m_plantManager; // 0x90
char m_unk94[0x4]; LegoAnimationManager* m_animationManager;
LegoBuildingManager* m_buildingManager; // 0x98 LegoBuildingManager* m_buildingManager; // 0x98
LegoGameState *m_gameState; // 0x9c LegoGameState *m_gameState; // 0x9c
MxDSAction m_action; MxDSAction m_action;
MxBackgroundAudioManager *m_bkgAudioManager; // 0x134 MxBackgroundAudioManager *m_bkgAudioManager; // 0x134
MxTransitionManager *m_transitionManager; // 0x138 MxTransitionManager *m_transitionManager; // 0x138
int m_unk13c; MxBool m_unk13c;
}; };
__declspec(dllexport) MxBackgroundAudioManager * BackgroundAudioManager(); __declspec(dllexport) MxBackgroundAudioManager * BackgroundAudioManager();

6
LEGO1/mxomni.cpp
View file

@ -121,6 +121,12 @@ void MxOmni::StopTimer()
} }
} }
// OFFSET: LEGO1 0x10058a90
MxBool MxOmni::IsTimerRunning()
{
return m_timerRunning;
}
// OFFSET: LEGO1 0x100b0690 // OFFSET: LEGO1 0x100b0690
void MxOmni::DestroyInstance() void MxOmni::DestroyInstance()
{ {

1
LEGO1/mxomni.h
View file

@ -48,6 +48,7 @@ class MxOmni : public MxCore
virtual void NotifyCurrentEntity(); // vtable+34 virtual void NotifyCurrentEntity(); // vtable+34
virtual void StartTimer(); // vtable+38 virtual void StartTimer(); // vtable+38
virtual void StopTimer(); // vtable+3c virtual void StopTimer(); // vtable+3c
virtual MxBool IsTimerRunning(); //vtable+40
static void SetInstance(MxOmni* instance); static void SetInstance(MxOmni* instance);
HWND GetWindowHandle() const { return this->m_windowHandle; } HWND GetWindowHandle() const { return this->m_windowHandle; }
MxObjectFactory* GetObjectFactory() const { return this->m_objectFactory; } MxObjectFactory* GetObjectFactory() const { return this->m_objectFactory; }