duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hat cleanup

Browse source
This commit is contained in:
Clownacy 2020-04-05 00:20:41 +01:00
parent 8fdaea5d8b
commit c187660904
2 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Backends/GLFW3/Controller.cpp
View file

@ -137,22 +137,22 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
// Then the joystick hats // Then the joystick hats
for (int i = 0; i < total_axes; ++i) for (int i = 0; i < total_axes; ++i)
{ {
status->bButton[buttons_done] = hats[i] == GLFW_HAT_UP; status->bButton[buttons_done] = hats[i] & GLFW_HAT_UP;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hats[i] == GLFW_HAT_RIGHT; status->bButton[buttons_done] = hats[i] & GLFW_HAT_RIGHT;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hats[i] == GLFW_HAT_DOWN; status->bButton[buttons_done] = hats[i] & GLFW_HAT_DOWN;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hats[i] == GLFW_HAT_LEFT; status->bButton[buttons_done] = hats[i] & GLFW_HAT_LEFT;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;

28
src/Backends/SDL2/Controller.cpp
View file

@ -78,42 +78,22 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
{ {
Uint8 hat = SDL_JoystickGetHat(joystick, i); Uint8 hat = SDL_JoystickGetHat(joystick, i);
status->bButton[buttons_done] = hat == SDL_HAT_UP; status->bButton[buttons_done] = hat == SDL_HAT_UP || hat == SDL_HAT_LEFTUP || hat == SDL_HAT_RIGHTUP;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hat == SDL_HAT_RIGHT; status->bButton[buttons_done] = hat == SDL_HAT_RIGHT || hat == SDL_HAT_RIGHTUP || hat == SDL_HAT_RIGHTDOWN;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hat == SDL_HAT_DOWN; status->bButton[buttons_done] = hat == SDL_HAT_DOWN || hat == SDL_HAT_LEFTDOWN || hat == SDL_HAT_RIGHTDOWN;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;
status->bButton[buttons_done] = hat == SDL_HAT_LEFT; status->bButton[buttons_done] = hat == SDL_HAT_LEFT || hat == SDL_HAT_LEFTUP || hat == SDL_HAT_LEFTDOWN;
if (++buttons_done >= button_limit)
break;
status->bButton[buttons_done] = hat == SDL_HAT_RIGHTUP;
if (++buttons_done >= button_limit)
break;
status->bButton[buttons_done] = hat == SDL_HAT_RIGHTDOWN;
if (++buttons_done >= button_limit)
break;
status->bButton[buttons_done] = hat == SDL_HAT_LEFTUP;
if (++buttons_done >= button_limit)
break;
status->bButton[buttons_done] = hat == SDL_HAT_LEFTDOWN;
if (++buttons_done >= button_limit) if (++buttons_done >= button_limit)
break; break;