From aa12f3f1db9b27bcd18d3758ef342404414a7ce4 Mon Sep 17 00:00:00 2001 From: Misha Date: Sat, 7 Oct 2023 12:58:08 -0400 Subject: [PATCH] fixes --- LEGO1/mxeventmanager.cpp | 3 +-- LEGO1/mxomni.cpp | 17 ++++++++--------- LEGO1/mxomni.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/mxeventmanager.cpp index 40cefc67..54cc2905 100644 --- a/LEGO1/mxeventmanager.cpp +++ b/LEGO1/mxeventmanager.cpp @@ -1,5 +1,4 @@ #include "mxeventmanager.h" -#include "decomp.h" // OFFSET: LEGO1 0x100c0360 MxEventManager::MxEventManager() @@ -19,7 +18,7 @@ void MxEventManager::Init() } // OFFSET: LEGO1 0x100c04a0 STUB -MxResult MxEventManager::vtable0x28(undefined4 p_unknown1, MxU8 p_unknown2) +MxResult MxEventManager::vtable0x28(undefined4 p_unknown1, undefined p_unknown2) { //TODO return FAILURE; diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index 76510562..7a5c38d7 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -2,7 +2,7 @@ #include "mxatomidcounter.h" #include "mxeventmanager.h" -#include "mxmusicmanager.h" +#include "mxmusicmanager.h" #include "mxnotificationmanager.h" #include "mxobjectfactory.h" #include "mxomnicreateparam.h" @@ -51,7 +51,7 @@ void MxOmni::Init() m_timer = NULL; m_streamer = NULL; m_atomIdCounterSet = NULL; - m_TimerRunning = FALSE; + m_timerRunning = FALSE; } // OFFSET: LEGO1 0x100b0090 @@ -72,7 +72,7 @@ void MxOmni::DeleteObject(MxDSAction &ds) // TODO } -// OFFSET: LEGO1 0x100b09a0 STUB +// OFFSET: LEGO1 100b09a0 STUB MxBool MxOmni::DoesEntityExist(MxDSAction &ds) { // TODO @@ -85,10 +85,9 @@ void MxOmni::vtable0x2c() // TODO } -// OFFSET: LEGO1 0x100aefb0 STUB +// OFFSET: LEGO1 0x100aefb0 int MxOmni::vtable0x30(char*, int, MxCore*) { - // TODO return 0; } @@ -101,22 +100,22 @@ void MxOmni::NotifyCurrentEntity() // OFFSET: LEGO1 0x100b09d0 void MxOmni::StartTimer() { - if (m_TimerRunning == FALSE && m_timer != NULL && m_soundManager != NULL) + if (m_timerRunning == FALSE && m_timer != NULL && m_soundManager != NULL) { m_timer->Start(); m_soundManager->vtable0x34(); - m_TimerRunning = TRUE; + m_timerRunning = TRUE; } } // OFFSET: LEGO1 0x100b0a00 void MxOmni::StopTimer() { - if (m_TimerRunning != FALSE && m_timer != NULL && m_soundManager != NULL) + if (m_timerRunning != FALSE && m_timer != NULL && m_soundManager != NULL) { m_timer->Stop(); m_soundManager->vtable0x38(); - m_TimerRunning = FALSE; + m_timerRunning = FALSE; } } diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h index 3cd9c14a..258af00c 100644 --- a/LEGO1/mxomni.h +++ b/LEGO1/mxomni.h @@ -82,7 +82,7 @@ class MxOmni : public MxCore MxCriticalSection m_criticalsection; // 0x48 - MxBool m_TimerRunning; // 0x64 + MxBool m_timerRunning; // 0x64 MxLong HandleNotificationType2(MxParam& p_param); };