mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-22 16:04:17 +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/lego/legoomni/include/legomain.h
View File

@@ -75,33 +75,33 @@ public:
};
LegoOmni();
~LegoOmni() override; // vtable+00
~LegoOmni() override;
MxLong Notify(MxParam& p_param) override; // vtable+04
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10058aa0
inline const char* ClassName() const override // vtable+0c
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f671c
return "LegoOmni";
}
// FUNCTION: LEGO1 0x10058ab0
inline MxBool IsA(const char* p_name) const override // vtable+10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoOmni::ClassName()) || MxOmni::IsA(p_name);
}
void Init() override; // vtable+14
MxResult Create(MxOmniCreateParam& p_param) override; // vtable+18
void Destroy() override; // vtable+1c
MxResult Start(MxDSAction* p_dsAction) override; // vtable+20
void DeleteObject(MxDSAction& p_dsAction) override; // vtable+24
MxBool DoesEntityExist(MxDSAction& p_dsAction) override; // vtable+28
MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
void NotifyCurrentEntity(const MxNotificationParam& p_param) override; // vtable+34
void StartTimer() override; // vtable+38
void StopTimer() override; // vtable+3c
void Init() override; // vtable+0x14
MxResult Create(MxOmniCreateParam& p_param) override; // vtable+0x18
void Destroy() override; // vtable+0x1c
MxResult Start(MxDSAction* p_dsAction) override; // vtable+0x20
void DeleteObject(MxDSAction& p_dsAction) override; // vtable+0x24
MxBool DoesEntityExist(MxDSAction& p_dsAction) override; // vtable+0x28
MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+0x30
void NotifyCurrentEntity(const MxNotificationParam& p_param) override; // vtable+0x34
void Pause() override; // vtable+0x38
void Resume() override; // vtable+0x3c
LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
LegoROI* FindROI(const char* p_name);

6
LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View File

@@ -607,11 +607,11 @@ MxLong LegoNavController::Notify(MxParam& p_param)
switch (((LegoEventNotificationParam&) p_param).GetKey()) {
case VK_PAUSE:
if (Lego()->IsTimerRunning()) {
Lego()->StopTimer();
if (Lego()->IsPaused()) {
Lego()->Resume();
}
else {
Lego()->StartTimer();
Lego()->Pause();
}
break;
case VK_ESCAPE: {

4
LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
View File

@@ -370,7 +370,7 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
MxBool processRoi;
if (p_param.GetType() == c_notificationKeyPress) {
if (!Lego()->IsTimerRunning() || p_param.GetKey() == VK_PAUSE) {
if (!Lego()->IsPaused() || p_param.GetKey() == VK_PAUSE) {
if (p_param.GetKey() == VK_SHIFT) {
if (m_unk0x195) {
m_unk0x80 = FALSE;
@@ -396,7 +396,7 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
}
}
else {
if (!Lego()->IsTimerRunning()) {
if (!Lego()->IsPaused()) {
processRoi = TRUE;
if (m_unk0x335 != 0) {

8
LEGO1/lego/legoomni/src/main/legomain.cpp
View File

@@ -579,15 +579,15 @@ MxLong LegoOmni::Notify(MxParam& p_param)
}
// FUNCTION: LEGO1 0x1005b640
void LegoOmni::StartTimer()
void LegoOmni::Pause()
{
MxOmni::StartTimer();
MxOmni::Pause();
SetAppCursor(e_cursorNo);
}
// FUNCTION: LEGO1 0x1005b650
void LegoOmni::StopTimer()
void LegoOmni::Resume()
{
MxOmni::StopTimer();
MxOmni::Resume();
SetAppCursor(e_cursorArrow);
}