mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-01-05 03:29:03 +00:00
Code Issues Releases Wiki Activity

more controller fixes

Browse Source
This commit is contained in:
Zeno Rogue
2025-12-18 02:12:56 +01:00
parent 0386143688
commit 7c01143a60
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
control.cpp
View File

@@ -255,7 +255,7 @@ EX bool gjoy_button(joydata &jd, int button) {
return SDL_JoystickGetButton(jd.joy, button);
}
EX bool gjoy_axis(joydata &jd, int axis) {
EX int gjoy_axis(joydata &jd, int axis) {
#if SDLVER >= 2
if(jd.gc) return SDL_GameControllerGetAxis(jd.gc, (SDL_GameControllerAxis) axis);
#endif
@@ -291,6 +291,13 @@ EX int gjoy_buttons(joydata& jd) {
return SDL_GetNumJoystickButtons(jd.joy);
}
EX int gjoy_axes(joydata& jd) {
#if SDLVER >= 2
if(jd.gc) return 6;
#endif
return SDL_GetNumJoystickButtons(jd.joy);
}
EX int gjoy_hats(joydata& jd) {
#if SDLVER >= 2
if(jd.gc) return 0;
@@ -1339,24 +1346,15 @@ EX void handle_event(SDL_Event& ev) {
#if SDLVER >= 2
if(ev.type == SDL_CONTROLLERAXISMOTION && normal && DEFAULTCONTROL) {
if(ev.caxis.which == 0) {
if(ev.caxis.axis == 0)
joyx = ev.caxis.value;
else if(ev.caxis.axis == 1)
joyy = ev.caxis.value;
else if(ev.caxis.axis == 2)
panjoyx = ev.caxis.value;
else if(ev.caxis.axis == 3)
panjoyy = ev.caxis.value;
checkjoy();
// printf("panjoy = %d,%d\n", panjoyx, panjoyy);
}
else {
if(ev.caxis.axis == 0)
panjoyx = ev.caxis.value;
else
panjoyy = ev.caxis.value;
}
if(ev.caxis.axis == 0)
joyx = ev.caxis.value;
else if(ev.caxis.axis == 1)
joyy = ev.caxis.value;
else if(ev.caxis.axis == 2)
panjoyx = ev.caxis.value;
else if(ev.caxis.axis == 3)
panjoyy = ev.caxis.value;
checkjoy();
}
#endif