rnd-20040822-3-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index ddc28e8d6615a427dcdb009c110e367fe81a762d..425c35e86f014dfbc4c079166e7bb76c1d7ccdd7 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -503,15 +503,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        {
          game_status = GAME_MODE_PLAYING;
          StopAnimation();
-
-#if 1
-
-         em_main_init_game();
-
-#else
          InitGame();
-
-#endif
        }
       }
       else if (y == 6)
@@ -2952,8 +2944,8 @@ void HandleGameActions()
   if (game_status != GAME_MODE_PLAYING)
     return;
 
-#if 1
-
+  /* !!! FIX THIS (START) !!! */
+  if (level.file_info.type == LEVEL_FILE_TYPE_EM)
   {
     byte summarized_player_action = 0;
     int i;
@@ -2967,22 +2959,20 @@ void HandleGameActions()
       DrawMainMenu();
     }
   }
+  else
+  {
+    if (local_player->LevelSolved)
+      GameWon();
 
-#else
-
-  if (local_player->LevelSolved)
-    GameWon();
-
-  if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
-    TapeStop();
+    if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+      TapeStop();
 
-  GameActions();
-  BackToFront();
-
-  if (tape.auto_play && !tape.playing)
-    AutoPlayTape();    /* continue automatically playing next tape */
+    GameActions();
+    BackToFront();
 
-#endif
+    if (tape.auto_play && !tape.playing)
+      AutoPlayTape();  /* continue automatically playing next tape */
+  }
 }
 
 /* ---------- new screen button stuff -------------------------------------- */