zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-09 15:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix use of wrong macros for game controller buttons in game-side input.cpp

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8006 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-14 16:11:55 +00:00 committed by Christoph Oelckers
parent 7ea2e4de54
commit f47b44f4b2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/duke3d/src/input.cpp
View file

@ -63,7 +63,7 @@ int32_t I_AdvanceTrigger(void)
#if !defined EDUKE32_TOUCH_DEVICES #if !defined EDUKE32_TOUCH_DEVICES
|| MOUSEINACTIVECONDITIONAL(MOUSE_GetButtons()&LEFT_MOUSE) || MOUSEINACTIVECONDITIONAL(MOUSE_GetButtons()&LEFT_MOUSE)
#endif #endif
|| (JOYSTICK_GetGameControllerButtons()&(1<<SDL_CONTROLLER_BUTTON_A)) || (JOYSTICK_GetGameControllerButtons()&(1<<GAMECONTROLLER_BUTTON_A))
#if defined(GEKKO) #if defined(GEKKO)
|| MOUSEINACTIVECONDITIONAL(JOYSTICK_GetButtons()&WII_A) || MOUSEINACTIVECONDITIONAL(JOYSTICK_GetButtons()&WII_A)
#endif #endif
@ -77,7 +77,7 @@ void I_AdvanceTriggerClear(void)
KB_ClearKeyDown(sc_kpad_Enter); KB_ClearKeyDown(sc_kpad_Enter);
KB_ClearKeyDown(sc_Enter); KB_ClearKeyDown(sc_Enter);
MOUSE_ClearButton(LEFT_MOUSE); MOUSE_ClearButton(LEFT_MOUSE);
JOYSTICK_ClearGameControllerButton(1<<SDL_CONTROLLER_BUTTON_A); JOYSTICK_ClearGameControllerButton(1<<GAMECONTROLLER_BUTTON_A);
#if defined(GEKKO) #if defined(GEKKO)
JOYSTICK_ClearButton(WII_A); JOYSTICK_ClearButton(WII_A);
#endif #endif
@ -88,7 +88,7 @@ int32_t I_ReturnTrigger(void)
return return
KB_KeyPressed(sc_Escape) KB_KeyPressed(sc_Escape)
|| (MOUSE_GetButtons()&RIGHT_MOUSE) || (MOUSE_GetButtons()&RIGHT_MOUSE)
|| (JOYSTICK_GetGameControllerButtons()&(1<<SDL_CONTROLLER_BUTTON_B)) || (JOYSTICK_GetGameControllerButtons()&(1<<GAMECONTROLLER_BUTTON_B))
#if defined(GEKKO) #if defined(GEKKO)
|| (JOYSTICK_GetButtons()&(WII_B|WII_HOME)) || (JOYSTICK_GetButtons()&(WII_B|WII_HOME))
#endif #endif
@ -100,7 +100,7 @@ void I_ReturnTriggerClear(void)
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
KB_ClearKeyDown(sc_Escape); KB_ClearKeyDown(sc_Escape);
MOUSE_ClearButton(RIGHT_MOUSE); MOUSE_ClearButton(RIGHT_MOUSE);
JOYSTICK_ClearGameControllerButton(1<<SDL_CONTROLLER_BUTTON_B); JOYSTICK_ClearGameControllerButton(1<<GAMECONTROLLER_BUTTON_B);
#if defined(GEKKO) #if defined(GEKKO)
JOYSTICK_ClearButton(WII_B); JOYSTICK_ClearButton(WII_B);
JOYSTICK_ClearButton(WII_HOME); JOYSTICK_ClearButton(WII_HOME);