diff options
| author | Bastien Bouclet | 2018-01-13 17:22:17 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-13 17:22:17 +0100 |
| commit | 45f1fd0e8e4fac90a76ec18c891933eba803922a (patch) | |
| tree | 6022fa29ca10784dd6dff2ec768caf1a8c00acbb /backends/platform | |
| parent | 07f2b34d2682d0b0f64c2d2d2543769d9b263924 (diff) | |
| parent | 3b8ffa0812184fda821ba3eeeec1bdc2b9d353bc (diff) | |
| download | scummvm-rg350-45f1fd0e8e4fac90a76ec18c891933eba803922a.tar.gz scummvm-rg350-45f1fd0e8e4fac90a76ec18c891933eba803922a.tar.bz2 scummvm-rg350-45f1fd0e8e4fac90a76ec18c891933eba803922a.zip | |
Merge pull request #1097 from bgK/vkeybd-data-path
VKEYBD: Fallback to SearchMan when loading keyboard packs
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/maemo/maemo.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/sdl/ps3/ps3.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/psp2/psp2.cpp | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index dc1054940e..326c35a28f 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -108,8 +108,6 @@ void OSystem_SDL_Maemo::initBackend() { _keymapperDefaultBindings = new Common::KeymapperDefaultBindings(); #endif - ConfMan.set("vkeybdpath", DATA_PATH); - _model = detectModel(); #ifdef ENABLE_KEYMAPPER diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp index 0bb8300014..b13088afd3 100644 --- a/backends/platform/sdl/ps3/ps3.cpp +++ b/backends/platform/sdl/ps3/ps3.cpp @@ -59,7 +59,6 @@ void OSystem_PS3::init() { void OSystem_PS3::initBackend() { ConfMan.set("joystick_num", 0); - ConfMan.set("vkeybdpath", PREFIX "/data"); ConfMan.registerDefault("fullscreen", true); ConfMan.registerDefault("aspect_ratio", true); diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp index 12154ba7d0..f959bbaf49 100644 --- a/backends/platform/sdl/psp2/psp2.cpp +++ b/backends/platform/sdl/psp2/psp2.cpp @@ -73,7 +73,6 @@ void OSystem_PSP2::init() { void OSystem_PSP2::initBackend() { ConfMan.set("joystick_num", 0); - ConfMan.set("vkeybdpath", PREFIX "/data"); ConfMan.registerDefault("fullscreen", true); ConfMan.registerDefault("aspect_ratio", false); ConfMan.registerDefault("gfx_mode", "2x"); |