mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Start/StopTimer to Pause/Resume (#1007)

Browse Source 
* Rename Start/StopTimer to Pause/Resume

* Fix
This commit is contained in:
Christian Semmler
2024-06-09 13:39:22 -04:00
committed by GitHub
parent 9bc5c26bcc
commit be4c351d7d
7 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LEGO1/omni/include/mxomni.h
View File

@@ -39,21 +39,21 @@ public:
MxOmni();
~MxOmni() override;
MxLong Notify(MxParam& p_param) override; // vtable+04
virtual void Init(); // vtable+14
virtual MxResult Create(MxOmniCreateParam& p_param); // vtable+18
virtual void Destroy(); // vtable+1c
virtual MxResult Start(MxDSAction* p_dsAction); // vtable+20
virtual void DeleteObject(MxDSAction& p_dsAction); // vtable+24
virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28
virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+2c
virtual MxEntity* AddToWorld(const char*, MxS32, MxPresenter*); // vtable+30
virtual void NotifyCurrentEntity(const MxNotificationParam& p_param); // vtable+34
virtual void StartTimer(); // vtable+38
virtual void StopTimer(); // vtable+3c
MxLong Notify(MxParam& p_param) override; // vtable+0x04
virtual void Init(); // vtable+0x14
virtual MxResult Create(MxOmniCreateParam& p_param); // vtable+0x18
virtual void Destroy(); // vtable+0x1c
virtual MxResult Start(MxDSAction* p_dsAction); // vtable+0x20
virtual void DeleteObject(MxDSAction& p_dsAction); // vtable+0x24
virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+0x28
virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+0x2c
virtual MxEntity* AddToWorld(const char*, MxS32, MxPresenter*); // vtable+0x30
virtual void NotifyCurrentEntity(const MxNotificationParam& p_param); // vtable+0x34
virtual void Pause(); // vtable+0x38
virtual void Resume(); // vtable+0x3c
// FUNCTION: LEGO1 0x10058a90
virtual MxBool IsTimerRunning() { return m_timerRunning; } // vtable+40
virtual MxBool IsPaused() { return m_paused; } // vtable+0x40
static void SetInstance(MxOmni* p_instance);
static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);
@@ -115,7 +115,7 @@ protected:
MxStreamer* m_streamer; // 0x40
MxAtomSet* m_atomSet; // 0x44
MxCriticalSection m_criticalSection; // 0x48
MxBool m_timerRunning; // 0x64
MxBool m_paused; // 0x64
};
#endif // MXOMNI_H

14
LEGO1/omni/src/main/mxomni.cpp
View File

@@ -68,7 +68,7 @@ void MxOmni::Init()
m_timer = NULL;
m_streamer = NULL;
m_atomSet = NULL;
m_timerRunning = FALSE;
m_paused = FALSE;
}
// FUNCTION: LEGO1 0x100af0b0
@@ -409,21 +409,21 @@ MxBool MxOmni::DoesEntityExist(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x100b09d0
void MxOmni::StartTimer()
void MxOmni::Pause()
{
if (m_timerRunning == FALSE && m_timer != NULL && m_soundManager != NULL) {
if (m_paused == FALSE && m_timer != NULL && m_soundManager != NULL) {
m_timer->Start();
m_soundManager->Pause();
m_timerRunning = TRUE;
m_paused = TRUE;
}
}
// FUNCTION: LEGO1 0x100b0a00
void MxOmni::StopTimer()
void MxOmni::Resume()
{
if (m_timerRunning != FALSE && m_timer != NULL && m_soundManager != NULL) {
if (m_paused != FALSE && m_timer != NULL && m_soundManager != NULL) {
m_timer->Stop();
m_soundManager->Resume();
m_timerRunning = FALSE;
m_paused = FALSE;
}
}