X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=3fb04ca6cfd939751004688e1ecd13dc09a7493a;hb=d7bb50dd6727a25908eaecca817b361d9b09158e;hp=109b1283b9cadc833b9d5bc21d37f71a8ceb85c7;hpb=efd80a08bd5de21956872a615f1d03f2dd90cee2;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 109b1283..3fb04ca6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -68,8 +68,9 @@ void DrawMainMenu()
     return;
   }
 
-  /* needed if last screen was the level editor */
-  UnmapLevelEditorGadgets();
+  /* unmap gadgets from last screen, map gadgets for main menu screen */
+  UnmapAllGadgets();
+  MapTapeButtons();
 
   FadeSounds();
   GetPlayerConfig();
@@ -675,6 +676,7 @@ void DrawHelpScreen()
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   for(i=0;i<MAX_HELPSCREEN_ELS;i++)
@@ -794,6 +796,7 @@ void HandleTypeName(int newxpos, KeySym key)
 
 void DrawChooseLevel()
 {
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   FadeToFront();
@@ -962,6 +965,7 @@ void DrawHallOfFame(int highlight_position)
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1029,6 +1033,7 @@ void DrawSetupScreen()
     { NULL,			"Save and exit"	}
   };
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
   ClearWindow();
   DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW);
@@ -2112,6 +2117,11 @@ void HandleGameActions()
 
 void HandleVideoButtons(int mx, int my, int button)
 {
+  return;
+
+
+
+
   if (game_status != MAINMENU && game_status != PLAYING)
     return;
 
@@ -2216,6 +2226,13 @@ void HandleVideoButtons(int mx, int my, int button)
 
 void HandleSoundButtons(int mx, int my, int button)
 {
+
+
+
+  return;
+
+
+
   if (game_status != PLAYING)
     return;
 
@@ -2277,6 +2294,13 @@ void HandleSoundButtons(int mx, int my, int button)
 
 void HandleGameButtons(int mx, int my, int button)
 {
+
+
+
+  return;
+
+
+
   if (game_status != PLAYING)
     return;