Renamed SDL_HINT_DIRECTINPUT_ENABLED to SDL_HINT_JOYSTICK_DIRECTINPUT
parent
a5da7d0dd5
commit
fd5d761128
|
@ -3012,3 +3012,7 @@ typedef SDL_version, SDL_Version;
|
|||
@@
|
||||
- SDL_HINT_ALLOW_TOPMOST
|
||||
+ SDL_HINT_WINDOW_ALLOW_TOPMOST
|
||||
@@
|
||||
@@
|
||||
- SDL_HINT_DIRECTINPUT_ENABLED
|
||||
+ SDL_HINT_JOYSTICK_DIRECTINPUT
|
||||
|
|
|
@ -726,6 +726,7 @@ The following hints have been removed:
|
|||
|
||||
The following hints have been renamed:
|
||||
* SDL_HINT_ALLOW_TOPMOST => SDL_HINT_WINDOW_ALLOW_TOPMOST
|
||||
* SDL_HINT_DIRECTINPUT_ENABLED => SDL_HINT_JOYSTICK_DIRECTINPUT
|
||||
|
||||
## SDL_init.h
|
||||
|
||||
|
|
|
@ -364,7 +364,7 @@ extern "C" {
|
|||
*
|
||||
* This hint should be set before SDL is initialized.
|
||||
*/
|
||||
#define SDL_HINT_DIRECTINPUT_ENABLED "SDL_DIRECTINPUT_ENABLED"
|
||||
#define SDL_HINT_JOYSTICK_DIRECTINPUT "SDL_JOYSTICK_DIRECTINPUT"
|
||||
|
||||
/**
|
||||
* Override for SDL_GetDisplayUsableBounds()
|
||||
|
|
|
@ -281,6 +281,7 @@
|
|||
|
||||
/* ##SDL_hints.h */
|
||||
#define SDL_HINT_ALLOW_TOPMOST SDL_HINT_WINDOW_ALLOW_TOPMOST
|
||||
#define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_JOYSTICK_DIRECTINPUT
|
||||
|
||||
/* ##SDL_joystick.h */
|
||||
#define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMEPAD
|
||||
|
@ -756,6 +757,7 @@
|
|||
|
||||
/* ##SDL_hints.h */
|
||||
#define SDL_HINT_ALLOW_TOPMOST SDL_HINT_ALLOW_TOPMOST_renamed_SDL_HINT_WINDOW_ALLOW_TOPMOST
|
||||
#define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_DIRECTINPUT_ENABLED_renamed_SDL_HINT_JOYSTICK_DIRECTINPUT
|
||||
|
||||
/* ##SDL_joystick.h */
|
||||
#define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMECONTROLLER_renamed_SDL_JOYSTICK_TYPE_GAMEPAD
|
||||
|
|
|
@ -71,7 +71,7 @@ int SDL_DINPUT_HapticInit(void)
|
|||
return SDL_SetError("Haptic: SubSystem already open.");
|
||||
}
|
||||
|
||||
if (!SDL_GetHintBoolean(SDL_HINT_DIRECTINPUT_ENABLED, SDL_TRUE)) {
|
||||
if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_DIRECTINPUT, SDL_TRUE)) {
|
||||
/* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -398,7 +398,7 @@ int SDL_DINPUT_JoystickInit(void)
|
|||
HRESULT result;
|
||||
HINSTANCE instance;
|
||||
|
||||
if (!SDL_GetHintBoolean(SDL_HINT_DIRECTINPUT_ENABLED, SDL_TRUE)) {
|
||||
if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_DIRECTINPUT, SDL_TRUE)) {
|
||||
/* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */
|
||||
dinput = NULL;
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue