rnd-20040822-3-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 9211c573411b2121b8897fa377786898cdfc180d..425c35e86f014dfbc4c079166e7bb76c1d7ccdd7 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -501,13 +501,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        else
 #endif
        {
-#if 1
-         em_main();
-#else
          game_status = GAME_MODE_PLAYING;
          StopAnimation();
          InitGame();
-#endif
        }
       }
       else if (y == 6)
@@ -2948,17 +2944,35 @@ void HandleGameActions()
   if (game_status != GAME_MODE_PLAYING)
     return;
 
-  if (local_player->LevelSolved)
-    GameWon();
+  /* !!! FIX THIS (START) !!! */
+  if (level.file_info.type == LEVEL_FILE_TYPE_EM)
+  {
+    byte summarized_player_action = 0;
+    int i;
 
-  if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
-    TapeStop();
+    for (i = 0; i < MAX_PLAYERS; i++)
+      summarized_player_action |= stored_player[i].action;
 
-  GameActions();
-  BackToFront();
+    if (em_main_handle_game(summarized_player_action) != 0)
+    {
+      game_status = GAME_MODE_MAIN;
+      DrawMainMenu();
+    }
+  }
+  else
+  {
+    if (local_player->LevelSolved)
+      GameWon();
 
-  if (tape.auto_play && !tape.playing)
-    AutoPlayTape();    /* continue automatically playing next tape */
+    if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+      TapeStop();
+
+    GameActions();
+    BackToFront();
+
+    if (tape.auto_play && !tape.playing)
+      AutoPlayTape();  /* continue automatically playing next tape */
+  }
 }
 
 /* ---------- new screen button stuff -------------------------------------- */