rnd-20040918-1-src

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 1d2396b025837c2238432b4b4c30261876cec9e3..cb8a7974bcf2a5f5345cd7b50b22fa6b723c4040 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2060,32 +2060,27 @@ void InitGame()
 
   CloseDoor(DOOR_CLOSE_1);
 
-#if 1
-
-  if (em_main_init_game(level_nr) != 0)
+  /* !!! FIX THIS (START) !!! */
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
-    game_status = GAME_MODE_MAIN;
-    DrawMainMenu();
-
-    return;
+    InitGameEngine_EM();
   }
+  else
+  {
+    DrawLevel();
+    DrawAllPlayers();
 
-#else
-
-  DrawLevel();
-  DrawAllPlayers();
-
-  /* after drawing the level, correct some elements */
-  if (game.timegate_time_left == 0)
-    CloseAllOpenTimegates();
-
-  if (setup.soft_scrolling)
-    BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
+    /* after drawing the level, correct some elements */
+    if (game.timegate_time_left == 0)
+      CloseAllOpenTimegates();
 
-  redraw_mask |= REDRAW_FROM_BACKBUFFER;
-  FadeToFront();
+    if (setup.soft_scrolling)
+      BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
 
-#endif
+    redraw_mask |= REDRAW_FROM_BACKBUFFER;
+    FadeToFront();
+  }
+  /* !!! FIX THIS (END) !!! */
 
   /* copy default game door content to main double buffer */
   BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
@@ -8594,6 +8589,7 @@ void GameActions()
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
 #if 1
+  /* !!! CHECK THIS (tape.pausing is always FALSE here!) !!! */
   if (recorded_player_action == NULL && tape.pausing)
     return;
 #endif