ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not require dpad mappings for joystick axis to work

This commit is contained in:
StapleButter 2018-12-02 15:11:56 +01:00
parent 5b20f40fad
commit 808bda9171
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libui_sdl/main.cpp
View File

@ -243,16 +243,25 @@ int EmuThreadFunc(void* burp)
bool pressed; bool pressed;
if (btnid == 0x101) // up if (btnid == 0x101) // up
pressed = (hat & SDL_HAT_UP) || (axisY <= -16384); pressed = (hat & SDL_HAT_UP);
else if (btnid == 0x104) // down else if (btnid == 0x104) // down
pressed = (hat & SDL_HAT_DOWN) || (axisY >= 16384); pressed = (hat & SDL_HAT_DOWN);
else if (btnid == 0x102) // right else if (btnid == 0x102) // right
pressed = (hat & SDL_HAT_RIGHT) || (axisX >= 16384); pressed = (hat & SDL_HAT_RIGHT);
else if (btnid == 0x108) // left else if (btnid == 0x108) // left
pressed = (hat & SDL_HAT_LEFT) || (axisX <= -16384); pressed = (hat & SDL_HAT_LEFT);
else else
pressed = SDL_JoystickGetButton(Joystick, btnid); pressed = SDL_JoystickGetButton(Joystick, btnid);
if (i == 4) // right
pressed = pressed || (axisX >= 16384);
else if (i == 5) // left
pressed = pressed || (axisX <= -16384);
else if (i == 6) // up
pressed = pressed || (axisY <= -16384);
else if (i == 7) // down
pressed = pressed || (axisY >= 16384);
if (pressed) joymask &= ~(1<<i); if (pressed) joymask &= ~(1<<i);
} }
} }
@ -509,7 +518,7 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
if (evt->Scancode == Config::KeyMapping[i]) if (evt->Scancode == Config::KeyMapping[i])
KeyInputMask &= ~(1<<i); KeyInputMask &= ~(1<<i);
//if (evt->Scancode == 0x58) // F12 //if (evt->Scancode == 0x57) // F11
// NDS::debug(0); // NDS::debug(0);
} }