Rename functions

This commit is contained in:
Christian Semmler 2024-01-28 09:13:23 -05:00
parent 433ea1d550
commit 49f00c20f8
2 changed files with 12 additions and 16 deletions

View File

@ -83,8 +83,8 @@ class LegoInputManager : public MxPresenter {
void ReleaseDX(); void ReleaseDX();
MxResult GetJoystickId(); MxResult GetJoystickId();
MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, DWORD* p_buttonsState, MxU32* p_povPosition); MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, DWORD* p_buttonsState, MxU32* p_povPosition);
void SetTimer(); void StartAutoDragTimer();
void KillTimer(); void StopAutoDragTimer();
void EnableInputProcessing(); void EnableInputProcessing();
void SetCamera(LegoCameraController* p_camera); void SetCamera(LegoCameraController* p_camera);
void ClearCamera(); void ClearCamera();
@ -123,8 +123,8 @@ class LegoInputManager : public MxPresenter {
undefined4 m_unk0x6c; // 0x6c undefined4 m_unk0x6c; // 0x6c
undefined4 m_unk0x70; // 0x70 undefined4 m_unk0x70; // 0x70
undefined4 m_unk0x74; // 0x74 undefined4 m_unk0x74; // 0x74
UINT m_timer; // 0x78 UINT m_autoDragTimerID; // 0x78
UINT m_timeout; // 0x7c UINT m_autoDragTime; // 0x7c
undefined m_unk0x80; // 0x80 undefined m_unk0x80; // 0x80
undefined m_unk0x81; // 0x81 undefined m_unk0x81; // 0x81
LegoControlManager* m_controlManager; // 0x84 LegoControlManager* m_controlManager; // 0x84

View File

@ -25,7 +25,7 @@ LegoInputManager::LegoInputManager()
m_camera = NULL; m_camera = NULL;
m_eventQueue = NULL; m_eventQueue = NULL;
m_unk0x80 = 0; m_unk0x80 = 0;
m_timer = 0; m_autoDragTimerID = 0;
m_unk0x6c = 0; m_unk0x6c = 0;
m_unk0x70 = 0; m_unk0x70 = 0;
m_controlManager = NULL; m_controlManager = NULL;
@ -41,7 +41,7 @@ LegoInputManager::LegoInputManager()
m_unk0x335 = FALSE; m_unk0x335 = FALSE;
m_unk0x336 = FALSE; m_unk0x336 = FALSE;
m_unk0x74 = 0x19; m_unk0x74 = 0x19;
m_timeout = 1000; m_autoDragTime = 1000;
} }
// FUNCTION: LEGO1 0x1005b8b0 // FUNCTION: LEGO1 0x1005b8b0
@ -365,7 +365,7 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
if (g_unk0x100f31b0 != -1 || m_controlManager->GetUnknown0x10() || if (g_unk0x100f31b0 != -1 || m_controlManager->GetUnknown0x10() ||
m_controlManager->GetUnknown0x0c() == 1) { m_controlManager->GetUnknown0x0c() == 1) {
MxBool result = m_controlManager->FUN_10029210(p_param, NULL); MxBool result = m_controlManager->FUN_10029210(p_param, NULL);
KillTimer(); StopAutoDragTimer();
m_unk0x80 = 0; m_unk0x80 = 0;
m_unk0x81 = 0; m_unk0x81 = 0;
@ -407,20 +407,16 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
} }
// FUNCTION: LEGO1 0x1005cfb0 // FUNCTION: LEGO1 0x1005cfb0
void LegoInputManager::SetTimer() void LegoInputManager::StartAutoDragTimer()
{ {
LegoOmni* omni = LegoOmni::GetInstance(); m_autoDragTimerID = ::SetTimer(LegoOmni::GetInstance()->GetWindowHandle(), 1, m_autoDragTime, NULL);
UINT timer = ::SetTimer(omni->GetWindowHandle(), 1, m_timeout, NULL);
m_timer = timer;
} }
// FUNCTION: LEGO1 0x1005cfd0 // FUNCTION: LEGO1 0x1005cfd0
void LegoInputManager::KillTimer() void LegoInputManager::StopAutoDragTimer()
{ {
if (m_timer != 0) { if (m_autoDragTimerID)
LegoOmni* omni = LegoOmni::GetInstance(); ::KillTimer(LegoOmni::GetInstance()->GetWindowHandle(), m_autoDragTimerID);
::KillTimer(omni->GetWindowHandle(), m_timer);
}
} }
// FUNCTION: LEGO1 0x1005cff0 // FUNCTION: LEGO1 0x1005cff0