Skip to content
Permalink
Browse files
Changed SDL_HINT_ACCEL_AS_JOY to SDL_HINT_ACCELEROMETER_AS_JOYSTICK t…
…o be more clear.
  • Loading branch information
slouken committed Mar 1, 2014
1 parent 54ba385 commit 63106e4729a394b697a887cb69d42886f7c2f4ea
Showing with 5 additions and 5 deletions.
  1. +1 −1 WhatsNew.txt
  2. +1 −1 include/SDL_hints.h
  3. +3 −3 src/joystick/android/SDL_sysjoystick.c
@@ -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.


---------------------------------------------------------------------------
@@ -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"


/**
@@ -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);
}

0 comments on commit 63106e4

Please sign in to comment.