X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=1465041cdb126c0006064c2406bade73626c193c;hb=d0e7ff980c3d4d73ac39c2670177e6030b966760;hp=ece8b097db923651cbc872a395e33111231c8b1c;hpb=066b410c0573fe64a1783116daf9d64883e9f03e;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index ece8b097..1465041c 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -135,8 +135,9 @@ void DrawMainMenu()
   UnmapAllGadgets();
   FadeSounds();
   KeyboardAutoRepeatOn();
-  ActivateJoystickIfAvailable();
+  ActivateJoystick();
   SetDrawDeactivationMask(REDRAW_NONE);
+  audio.sound_deactivated = FALSE;
 
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
@@ -1486,6 +1487,8 @@ static struct TokenInfo setup_info_shortcut[] =
   { TYPE_KEY,		&setup.shortcut.save_game,	""		},
   { TYPE_KEYTEXT,	NULL,			"Quick Load Game:",	},
   { TYPE_KEY,		&setup.shortcut.load_game,	""		},
+  { TYPE_KEYTEXT,	NULL,			"Toggle Pause:",	},
+  { TYPE_KEY,		&setup.shortcut.toggle_pause,	""		},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Exit"			},
   { 0,			NULL,			NULL			}
@@ -1796,9 +1799,11 @@ void DrawSetupScreen_Input()
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
 
+#if 0
   DeactivateJoystickForCalibration();
   DrawTextFCentered(SYSIZE - 20, FC_BLUE,
 		    "Joysticks deactivated on this screen");
+#endif
 
   HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
   FadeToFront();
@@ -2347,6 +2352,8 @@ void CalibrateJoystick(int player_nr)
 
 void DrawSetupScreen()
 {
+  DeactivateJoystick();
+
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)