added enabling/disabling virtual button overlay depending on input events

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index b543e6d2e14132d345e14aca528e069efdc98e54..89e0c110a1e0255bbd22f5d55040666ff66ea1ff 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)
@@ -4461,7 +4460,8 @@ void GameEnd()
     SaveLevelSetup_SeriesInfo();
   }
 
-  if (level_nr < leveldir_current->last_level)
+  if (setup.increment_levels &&
+      level_nr < leveldir_current->last_level)
     raise_level = TRUE;                        /* advance to next level */
 
   if ((hi_pos = NewHiScore()) >= 0)