X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ddc28e8d6615a427dcdb009c110e367fe81a762d;hb=c405cf118d3d31c2b6e1fe935671ecdaeb031f8f;hp=12901f035f76b63fdb3e47d1217f3da7afe9e6bd;hpb=0cb7e467765fe1ac2797cb58c069fcca56d43877;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 12901f03..ddc28e8d 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -503,7 +503,15 @@ 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)
@@ -2944,6 +2952,24 @@ void HandleGameActions()
   if (game_status != GAME_MODE_PLAYING)
     return;
 
+#if 1
+
+  {
+    byte summarized_player_action = 0;
+    int i;
+
+    for (i = 0; i < MAX_PLAYERS; i++)
+      summarized_player_action |= stored_player[i].action;
+
+    if (em_main_handle_game(summarized_player_action) != 0)
+    {
+      game_status = GAME_MODE_MAIN;
+      DrawMainMenu();
+    }
+  }
+
+#else
+
   if (local_player->LevelSolved)
     GameWon();
 
@@ -2955,6 +2981,8 @@ void HandleGameActions()
 
   if (tape.auto_play && !tape.playing)
     AutoPlayTape();	/* continue automatically playing next tape */
+
+#endif
 }
 
 /* ---------- new screen button stuff -------------------------------------- */