diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/events/sdl/sdl-events.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/sdl/psp2/psp2.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 10 |
3 files changed, 3 insertions, 18 deletions
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index 6d48b8d372..d4e8956366 100644 --- a/backends/events/sdl/sdl-events.cpp +++ b/backends/events/sdl/sdl-events.cpp @@ -32,7 +32,6 @@ // FIXME move joystick defines out and replace with confile file options // we should really allow users to map any key to a joystick button -#define JOY_DEADZONE 3200 // #define JOY_INVERT_Y #define JOY_XAXIS 0 @@ -1022,9 +1021,7 @@ bool SdlEventSource::handleAxisToMouseMotion(int16 xAxis, int16 yAxis) { float analogX = (float)xAxis; float analogY = (float)yAxis; - float deadZone = (float)JOY_DEADZONE; - if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) - deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f; + float deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f; float magnitude = sqrt(analogX * analogX + analogY * analogY); diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp index 94b06e6d23..f323db72af 100644 --- a/backends/platform/sdl/psp2/psp2.cpp +++ b/backends/platform/sdl/psp2/psp2.cpp @@ -94,12 +94,6 @@ void OSystem_PSP2::initBackend() { if (!ConfMan.hasKey("filtering")) { ConfMan.setBool("filtering", true); } - if (!ConfMan.hasKey("kbdmouse_speed")) { - ConfMan.setInt("kbdmouse_speed", 3); - } - if (!ConfMan.hasKey("joystick_deadzone")) { - ConfMan.setInt("joystick_deadzone", 2); - } if (!ConfMan.hasKey("shader")) { ConfMan.setInt("shader", 2); } diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 68499b1ed8..360baf9d1e 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -90,6 +90,8 @@ OSystem_SDL::OSystem_SDL() _eventSource(0), _window(0) { + ConfMan.registerDefault("kbdmouse_speed", 3); + ConfMan.registerDefault("joystick_deadzone", 3); } OSystem_SDL::~OSystem_SDL() { @@ -287,14 +289,6 @@ void OSystem_SDL::initBackend() { _inited = true; - if (!ConfMan.hasKey("kbdmouse_speed")) { - ConfMan.registerDefault("kbdmouse_speed", 3); - ConfMan.setInt("kbdmouse_speed", 3); - } - if (!ConfMan.hasKey("joystick_deadzone")) { - ConfMan.registerDefault("joystick_deadzone", 3); - ConfMan.setInt("joystick_deadzone", 3); - } ModularBackend::initBackend(); // We have to initialize the graphics manager before the event manager |