rocksndiamonds-3.1.2

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 43a9b6079252a0fc2b42de9f09d1a6ad48659ced..7d783a9b21a3f672e3f5c13ce5574d63db856b8a 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -511,9 +511,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y == 5)
       {
-#if 1
-       StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
-#else
        if (setup.autorecord)
          TapeStartRecording();
 
@@ -527,7 +524,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          StopAnimation();
          InitGame();
        }
-#endif
       }
       else if (y == 6)
       {
@@ -750,10 +746,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
     for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
       infoscreen_step[i] = infoscreen_frame[i] = 0;
 
-#if 0
     SetMainBackgroundImage(IMG_BACKGROUND_INFO);
-#endif
-
     ClearWindow();
     DrawHeadline();
 
@@ -899,8 +892,6 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 
 void DrawInfoScreen_Elements()
 {
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
-
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
@@ -976,8 +967,6 @@ void HandleInfoScreen_Elements(int button)
 
 void DrawInfoScreen_Music()
 {
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
-
   ClearWindow();
   DrawHeadline();
 
@@ -1110,8 +1099,6 @@ void DrawInfoScreen_Credits()
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS);
-
   FadeSoundsAndMusic();
 
   ClearWindow();
@@ -1160,8 +1147,6 @@ void DrawInfoScreen_Program()
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
-
   ClearWindow();
   DrawHeadline();
 
@@ -1239,8 +1224,6 @@ void DrawInfoScreen_LevelSet()
   int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
   int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
-
   ClearWindow();
   DrawHeadline();
 
@@ -3099,9 +3082,6 @@ void HandleGameActions()
   }
   else
   {
-    if (game.restart_level)
-      StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
-
     if (local_player->LevelSolved)
       GameWon();
 
@@ -3116,30 +3096,6 @@ void HandleGameActions()
   }
 }
 
-void StartGameActions(boolean init_network_game, boolean record_tape,
-                     long random_seed)
-{
-  if (record_tape)
-    TapeStartRecording(random_seed);
-
-#if defined(NETWORK_AVALIABLE)
-  if (init_network_game)
-  {
-    SendToServer_StartPlaying();
-
-    return;
-  }
-#endif
-
-  StopAnimation();
-
-  game_status = GAME_MODE_PLAYING;
-
-  InitRND(random_seed);
-
-  InitGame();
-}
-
 /* ---------- new screen button stuff -------------------------------------- */
 
 /* graphic position and size values for buttons and scrollbars */