From 63106e4729a394b697a887cb69d42886f7c2f4ea Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 1 Mar 2014 12:21:15 -0800 Subject: [PATCH] Changed SDL_HINT_ACCEL_AS_JOY to SDL_HINT_ACCELEROMETER_AS_JOYSTICK to be more clear. --- WhatsNew.txt | 2 +- include/SDL_hints.h | 2 +- src/joystick/android/SDL_sysjoystick.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WhatsNew.txt b/WhatsNew.txt index 83c1be202..ae1ed18e9 100644 --- a/WhatsNew.txt +++ b/WhatsNew.txt @@ -41,7 +41,7 @@ Android: the required runtime version remains at 10, but on such devices joystick support won't be available). * Hotplugging support for joysticks -* Added a hint SDL_HINT_ACCEL_AS_JOY to control whether the accelerometer should be listed as a 3 axis joystick, which it will by default. +* Added a hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK to control whether the accelerometer should be listed as a 3 axis joystick, which it will by default. --------------------------------------------------------------------------- diff --git a/include/SDL_hints.h b/include/SDL_hints.h index 26edca586..9fd9dae82 100644 --- a/include/SDL_hints.h +++ b/include/SDL_hints.h @@ -244,7 +244,7 @@ extern "C" { * "0" - List only real joysticks and accept input from them * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). */ -#define SDL_HINT_ACCEL_AS_JOY "SDL_ACCEL_AS_JOY" +#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" /** diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c index ce49fa933..422c5f5f4 100644 --- a/src/joystick/android/SDL_sysjoystick.c +++ b/src/joystick/android/SDL_sysjoystick.c @@ -379,11 +379,11 @@ Android_RemoveJoystick(int device_id) int SDL_SYS_JoystickInit(void) { - const char *env; + const char *hint; SDL_SYS_JoystickDetect(); - env = SDL_GetHint(SDL_HINT_ACCEL_AS_JOY); - if (!env || SDL_atoi(env)) { + hint = SDL_GetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK); + if (!hint || SDL_atoi(hint)) { /* Default behavior, accelerometer as joystick */ Android_AddJoystick(ANDROID_ACCELEROMETER_DEVICE_ID, ANDROID_ACCELEROMETER_NAME, SDL_TRUE, 0, 3, 0, 0); }