isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2023-10-03 13:35:50 -04:00
parent a6c4cae4b6
commit 91e2e19a94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/legoinputmanager.cpp
View File

@ -26,8 +26,8 @@ LegoInputManager::LegoInputManager()
m_unk0x195 = 0; m_unk0x195 = 0;
m_joyid = (UINT) -1; m_joyid = (UINT) -1;
m_joystickIndex = -1; m_joystickIndex = -1;
m_joystickIndex2 = 0;
m_useJoystick = FALSE; m_useJoystick = FALSE;
m_unk0x335 = 0;
m_unk0x336 = 0; m_unk0x336 = 0;
m_unk0x74 = 0x19; m_unk0x74 = 0x19;
m_timeout = 1000; m_timeout = 1000;
@ -99,7 +99,7 @@ MxResult LegoInputManager::GetJoystickId()
{ {
JOYINFOEX joyinfoex; JOYINFOEX joyinfoex;
if (m_joystickIndex2 != JOYSTICKID1) { if (m_useJoystick != FALSE) {
MxS32 joyid = m_joystickIndex; MxS32 joyid = m_joystickIndex;
if (joyid >= 0) { if (joyid >= 0) {
joyinfoex.dwSize = 0x34; joyinfoex.dwSize = 0x34;
@ -127,9 +127,9 @@ MxResult LegoInputManager::GetJoystickId()
// OFFSET: LEGO1 0x1005c320 // OFFSET: LEGO1 0x1005c320
MxResult LegoInputManager::GetJoystickState(MxU32 *joystick_x, MxU32 *joystick_y, DWORD *buttons_state, MxU32 *pov_position) MxResult LegoInputManager::GetJoystickState(MxU32 *joystick_x, MxU32 *joystick_y, DWORD *buttons_state, MxU32 *pov_position)
{ {
if (m_joystickIndex2 != JOYSTICKID1) { if (m_useJoystick != FALSE) {
if (m_joyid < 0 && GetJoystickId() == -1) { if (m_joyid < 0 && GetJoystickId() == -1) {
m_joystickIndex2 = 0; m_useJoystick = FALSE;
return FAILURE; return FAILURE;
} }

2
LEGO1/legoinputmanager.h
View File

@ -66,8 +66,8 @@ class LegoInputManager : public MxPresenter
MxS32 m_joyid; MxS32 m_joyid;
MxS32 m_joystickIndex; MxS32 m_joystickIndex;
JOYCAPS m_joyCaps; JOYCAPS m_joyCaps;
MxU8 m_joystickIndex2;
MxBool m_useJoystick; MxBool m_useJoystick;
MxBool m_unk0x335;
MxBool m_unk0x336; MxBool m_unk0x336;
}; };