diff options
| author | Eugene Sandulenko | 2017-02-24 22:00:10 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-24 22:00:10 +0100 |
| commit | 8a547c8711a63c07bef974ad9457f57bf5658634 (patch) | |
| tree | c1baf5d112f35dc1b80a3087fb6b164712b03b27 /backends/platform | |
| parent | 4b364787863b62f7a141f38646a8772e921fb1e7 (diff) | |
| parent | 45bd7a8b75ebd8227ec4a09e427a66b1bb2796d1 (diff) | |
| download | scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.tar.gz scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.tar.bz2 scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.zip | |
Merge pull request #908 from rsn8887/upstream
SDL: Fix erratic analog pointer + control options
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 74c40ade10..1c5a7c2cbf 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -179,6 +179,10 @@ bool OSystem_SDL::hasFeature(Feature f) { #if SDL_VERSION_ATLEAST(2, 0, 0) if (f == kFeatureClipboardSupport) return true; #endif +#ifdef JOY_ANALOG + if (f == kFeatureJoystickDeadzone) return true; +#endif + if (f == kFeatureKbdMouseSpeed) return true; return ModularBackend::hasFeature(f); } @@ -274,6 +278,16 @@ void OSystem_SDL::initBackend() { _inited = true; + if (!ConfMan.hasKey("kbdmouse_speed")) { + ConfMan.registerDefault("kbdmouse_speed", 3); + ConfMan.setInt("kbdmouse_speed", 3); + } +#ifdef JOY_ANALOG + if (!ConfMan.hasKey("joystick_deadzone")) { + ConfMan.registerDefault("joystick_deadzone", 3); + ConfMan.setInt("joystick_deadzone", 3); + } +#endif ModularBackend::initBackend(); // We have to initialize the graphics manager before the event manager |