PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-05 00:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

mainloop: Replace ALLEGRO_WITH_XWINDOWS usage with al_get_system_id()

Browse source 
This should make the binaries platform agnostic.
This commit is contained in:
Sebastian Krzyszkowiak 2021-07-26 04:29:26 +02:00
parent e6ee232759
commit 26f8a187fc
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mainloop.c
View file

@ -112,19 +112,25 @@ static inline bool HandleEvent(struct Game* game, ALLEGRO_EVENT* ev) {
al_reconfigure_joysticks();
break;
case ALLEGRO_EVENT_JOYSTICK_AXIS:
#ifdef ALLEGRO_WITH_XWINDOWS
// XBox pads on GNU/Linux have messed up stick/axis ordering
if (ev->joystick.axis == 0) {
if (ev->joystick.stick == 2) {
ev->joystick.stick = 1;
} else if (ev->joystick.stick == 1) {
ev->joystick.stick = 2;
#if (ALLEGRO_VERSION_INT >= ((5 << 24) | (2 << 16) | (5 << 8)))
if ((al_get_system_id() == ALLEGRO_SYSTEM_ID_XGLX) || (al_get_system_id() == ALLEGRO_SYSTEM_ID_RASPBERRYPI)) {
#elif defined(ALLEGRO_WITH_XWINDOWS)
if (true) {
#else
if (false) {
#endif
// XBox pads on GNU/Linux have messed up stick/axis ordering
if (ev->joystick.axis == 0) {
if (ev->joystick.stick == 2) {
ev->joystick.stick = 1;
} else if (ev->joystick.stick == 1) {
ev->joystick.stick = 2;
}
}
if (ev->joystick.stick == 1) {
ev->joystick.axis = 1 - ev->joystick.axis;
}
}
if (ev->joystick.stick == 1) {
ev->joystick.axis = 1 - ev->joystick.axis;
}
#endif
break;
#ifdef __SWITCH__
case ALLEGRO_EVENT_JOYSTICK_BUTTON_DOWN: