major cleanup of preprocessor hell

[rocksndiamonds.git] / src / game_sp / main.c

diff --git a/src/game_sp/main.c b/src/game_sp/main.c
index 4da92cd3286972936cdb5a7d8034a621c4f269c6..4486656ffd7864693ad47dec5923f471bb0c5d24 100644 (file)
--- a/src/game_sp/main.c
+++ b/src/game_sp/main.c
@@ -31,12 +31,10 @@ void InitGameEngine_SP()
   game_sp.scroll_xoffset = (EVEN(SCR_FIELDX) ? TILEX / 2 : 0);
   game_sp.scroll_yoffset = (EVEN(SCR_FIELDY) ? TILEY / 2 : 0);
 
-#if 1
   if (native_sp_level.width <= SCR_FIELDX)
     game_sp.scroll_xoffset = TILEX / 2;
   if (native_sp_level.height <= SCR_FIELDY)
     game_sp.scroll_yoffset = TILEY / 2;
-#endif
 
   for (x = 0; x < SP_MAX_PLAYFIELD_WIDTH; x++)
   {
@@ -66,7 +64,7 @@ void RedrawPlayfield_SP(boolean force_redraw)
 
 void DrawGameDoorValues_SP()
 {
-  game_sp.time_played = TimerVar / setup.game_frame_delay;
+  game_sp.time_played = TimerVar / FRAMES_PER_SECOND;
   game_sp.infotrons_still_needed = InfotronsNeeded;
   game_sp.red_disk_count = RedDiskCount;
   game_sp.score = 0;           // (currently no score in Supaplex engine)
@@ -86,7 +84,15 @@ void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
   if (!warp_mode)              /* do not redraw values in warp mode */
     DrawGameDoorValues_SP();
 
+  CheckSingleStepMode_SP(PlayField16[MurphyPosIndex] == fiMurphy,
+                        HighByte(PlayField16[MurphyPosIndex]) == 0x2A);
+
   for (x = DisplayMinX; x <= DisplayMaxX; x++)
     for (y = DisplayMinY; y <= DisplayMaxY; y++)
       GfxFrame[x][y]++;
 }
+
+int getRedDiskReleaseFlag_SP()
+{
+  return RedDiskReleaseFlag;
+}