moved game controller base mappings file to new 'conf' sub-directory

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 8d2ed466dc3be327c5fc1a22de7dfcbff5b8bc59..e87dcd04aef71ce57f0e6af83b8b5b8dcbfd7cd9 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1619,7 +1619,6 @@ void GetPlayerConfig()
   setup.sound = (setup.sound_simple || setup.sound_loops || setup.sound_music);
 
   SetAudioMode(setup.sound);
-  InitJoysticks();
 }
 
 int GetElementFromGroupElement(int element)
@@ -2699,6 +2698,9 @@ static void InitGameEngine()
   game.use_block_last_field_bug =
     (game.engine_version < VERSION_IDENT(3,1,1,0));
 
+  game_em.use_single_button = game_em.use_single_button_initial =
+    (game.engine_version > VERSION_IDENT(4,0,0,2));
+
   /* ---------------------------------------------------------------------- */
 
   /* set maximal allowed number of custom element changes per game frame */