Fixed test code after gamepad event rename

This commit is contained in:
Sam Lantinga 2022-12-27 10:28:43 -08:00
parent ad8a6d2b05
commit 960e9044b3

View file

@ -1388,15 +1388,15 @@ static const char *ControllerAxisName(const SDL_GamepadAxis axis)
{ {
switch (axis) { switch (axis) {
#define AXIS_CASE(ax) \ #define AXIS_CASE(ax) \
case SDL_CONTROLLER_AXIS_##ax: \ case SDL_GAMEPAD_AXIS_##ax: \
return #ax return #ax
AXIS_CASE(INVALID); AXIS_CASE(INVALID);
AXIS_CASE(LEFTX); AXIS_CASE(LEFTX);
AXIS_CASE(LEFTY); AXIS_CASE(LEFTY);
AXIS_CASE(RIGHTX); AXIS_CASE(RIGHTX);
AXIS_CASE(RIGHTY); AXIS_CASE(RIGHTY);
AXIS_CASE(TRIGGERLEFT); AXIS_CASE(LEFT_TRIGGER);
AXIS_CASE(TRIGGERRIGHT); AXIS_CASE(RIGHT_TRIGGER);
#undef AXIS_CASE #undef AXIS_CASE
default: default:
return "???"; return "???";
@ -1407,7 +1407,7 @@ static const char *ControllerButtonName(const SDL_GamepadButton button)
{ {
switch (button) { switch (button) {
#define BUTTON_CASE(btn) \ #define BUTTON_CASE(btn) \
case SDL_CONTROLLER_BUTTON_##btn: \ case SDL_GAMEPAD_BUTTON_##btn: \
return #btn return #btn
BUTTON_CASE(INVALID); BUTTON_CASE(INVALID);
BUTTON_CASE(A); BUTTON_CASE(A);
@ -1417,10 +1417,10 @@ static const char *ControllerButtonName(const SDL_GamepadButton button)
BUTTON_CASE(BACK); BUTTON_CASE(BACK);
BUTTON_CASE(GUIDE); BUTTON_CASE(GUIDE);
BUTTON_CASE(START); BUTTON_CASE(START);
BUTTON_CASE(LEFTSTICK); BUTTON_CASE(LEFT_STICK);
BUTTON_CASE(RIGHTSTICK); BUTTON_CASE(RIGHT_STICK);
BUTTON_CASE(LEFTSHOULDER); BUTTON_CASE(LEFT_SHOULDER);
BUTTON_CASE(RIGHTSHOULDER); BUTTON_CASE(RIGHT_SHOULDER);
BUTTON_CASE(DPAD_UP); BUTTON_CASE(DPAD_UP);
BUTTON_CASE(DPAD_DOWN); BUTTON_CASE(DPAD_DOWN);
BUTTON_CASE(DPAD_LEFT); BUTTON_CASE(DPAD_LEFT);