mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-09-06 03:18:13 +00:00
Merge commit 'ed1bdf32ee5ad5f0ca503718d4b4563e7889a1a0' into main
This commit is contained in:
@@ -31,6 +31,62 @@
|
|||||||
// So this file is a set of many semantic patches, mostly independant.
|
// So this file is a set of many semantic patches, mostly independant.
|
||||||
|
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_JoystickGetDevicePlayerIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetJoystickInstancePlayerIndex(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_JoystickIsVirtual(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_IsJoystickVirtual(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_JoystickPathForIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetJoystickInstancePath(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_IsGameController(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_IsGamepad(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_GameControllerMappingForDeviceIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetGamepadInstanceMapping(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_GameControllerNameForIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetGamepadInstanceName(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_GameControllerPathForIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetGamepadInstancePath(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression e;
|
||||||
|
@@
|
||||||
|
- SDL_GameControllerTypeForIndex(e)
|
||||||
|
+ /* FIXME MIGRATION: check for valid instance */
|
||||||
|
+ SDL_GetGamepadInstanceType(GetJoystickInstanceFromIndex(e))
|
||||||
|
|
||||||
|
|
||||||
// SDL_Has3DNow() has been removed; there is no replacement.
|
// SDL_Has3DNow() has been removed; there is no replacement.
|
||||||
@@
|
@@
|
||||||
@@ -1096,11 +1152,6 @@ typedef SDL_GameControllerButtonBind, SDL_GamepadBinding;
|
|||||||
(...)
|
(...)
|
||||||
@@
|
@@
|
||||||
@@
|
@@
|
||||||
- SDL_GameControllerMappingForDeviceIndex
|
|
||||||
+ SDL_GetGamepadMappingForDeviceIndex
|
|
||||||
(...)
|
|
||||||
@@
|
|
||||||
@@
|
|
||||||
- SDL_GameControllerMappingForGUID
|
- SDL_GameControllerMappingForGUID
|
||||||
+ SDL_GetGamepadMappingForGUID
|
+ SDL_GetGamepadMappingForGUID
|
||||||
(...)
|
(...)
|
||||||
@@ -1175,11 +1226,6 @@ typedef SDL_GameControllerButtonBind, SDL_GamepadBinding;
|
|||||||
+ SDL_INIT_GAMEPAD
|
+ SDL_INIT_GAMEPAD
|
||||||
@@
|
@@
|
||||||
@@
|
@@
|
||||||
- SDL_IsGameController
|
|
||||||
+ SDL_IsGamepad
|
|
||||||
(...)
|
|
||||||
@@
|
|
||||||
@@
|
|
||||||
- SDL_JOYSTICK_TYPE_GAMECONTROLLER
|
- SDL_JOYSTICK_TYPE_GAMECONTROLLER
|
||||||
+ SDL_JOYSTICK_TYPE_GAMEPAD
|
+ SDL_JOYSTICK_TYPE_GAMEPAD
|
||||||
@@
|
@@
|
||||||
@@ -1299,11 +1345,6 @@ typedef SDL_GameControllerButtonBind, SDL_GamepadBinding;
|
|||||||
(...)
|
(...)
|
||||||
@@
|
@@
|
||||||
@@
|
@@
|
||||||
- SDL_JoystickIsVirtual
|
|
||||||
+ SDL_IsJoystickVirtual
|
|
||||||
(...)
|
|
||||||
@@
|
|
||||||
@@
|
|
||||||
- SDL_JoystickName
|
- SDL_JoystickName
|
||||||
+ SDL_GetJoystickName
|
+ SDL_GetJoystickName
|
||||||
(...)
|
(...)
|
||||||
|
Reference in New Issue
Block a user