Merge branch 'master' into releases

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

diff --git a/src/game_sp/main.c b/src/game_sp/main.c
index 1308353d0ba96f29ea7713681d4861f2fc299ab7..4fe06feb1a44fa796b6b3dbc1dd21d9b9749db7e 100644 (file)
--- a/src/game_sp/main.c
+++ b/src/game_sp/main.c
@@ -66,10 +66,20 @@ void RedrawPlayfield_SP(boolean force_redraw)
 
 void DrawGameDoorValues_SP()
 {
-  game_sp.time_played = TimerVar / setup.game_frame_delay;
+#if 1
+  // game_sp.time_played = TimerVar / FRAMES_PER_SECOND_SP;
+  game_sp.time_played = TimerVar / FRAMES_PER_SECOND;
+#else
+  game_sp.time_played = TimerVar * setup.game_frame_delay / 1000;
+#endif
   game_sp.infotrons_still_needed = InfotronsNeeded;
   game_sp.red_disk_count = RedDiskCount;
   game_sp.score = 0;           // (currently no score in Supaplex engine)
+
+#if 0
+  printf("::: %d, %d => %d\n",
+        TimerVar, setup.game_frame_delay, game_sp.time_played);
+#endif
 }
 
 void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
@@ -86,9 +96,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);
+  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;
+}