eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-25 05:59:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changed enums to use XXX_COUNT for the count or number of values

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/10763
This commit is contained in:
Sam Lantinga 2024-09-11 08:08:18 -07:00
parent 64f12bea4a
commit 37c9fb490e
49 changed files with 197 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/testcontroller.c
View file

@ -479,8 +479,8 @@ static void CommitBindingElement(const char *binding, SDL_bool force)
/* If the controller generates multiple events for a single element, pick the best one */
if (!force && binding_advance_time) {
char *current = GetElementBinding(mapping, binding_element);
SDL_bool native_button = (binding_element < SDL_GAMEPAD_BUTTON_MAX);
SDL_bool native_axis = (binding_element >= SDL_GAMEPAD_BUTTON_MAX &&
SDL_bool native_button = (binding_element < SDL_GAMEPAD_BUTTON_COUNT);
SDL_bool native_axis = (binding_element >= SDL_GAMEPAD_BUTTON_COUNT &&
binding_element <= SDL_GAMEPAD_ELEMENT_AXIS_MAX);
SDL_bool native_trigger = (binding_element == SDL_GAMEPAD_ELEMENT_AXIS_LEFT_TRIGGER ||
binding_element == SDL_GAMEPAD_ELEMENT_AXIS_RIGHT_TRIGGER);
@ -1161,8 +1161,8 @@ static void OpenVirtualGamepad(void)
SDL_INIT_INTERFACE(&desc);
desc.type = SDL_JOYSTICK_TYPE_GAMEPAD;
desc.naxes = SDL_GAMEPAD_AXIS_MAX;
desc.nbuttons = SDL_GAMEPAD_BUTTON_MAX;
desc.naxes = SDL_GAMEPAD_AXIS_COUNT;
desc.nbuttons = SDL_GAMEPAD_BUTTON_COUNT;
desc.ntouchpads = 1;
desc.touchpads = &virtual_touchpad;
desc.nsensors = 1;
@ -1269,7 +1269,7 @@ static void VirtualGamepadMouseDown(float x, float y)
return;
}
if (element < SDL_GAMEPAD_BUTTON_MAX) {
if (element < SDL_GAMEPAD_BUTTON_COUNT) {
virtual_button_active = (SDL_GamepadButton)element;
SDL_SetJoystickVirtualButton(virtual_joystick, virtual_button_active, SDL_TRUE);
} else {