X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2Fmain.c;h=206ae571c3486a118b19d48d8300dbd85545b04d;hb=92ae204856b3b41863f4244dd75cc5c7268f034d;hp=a29d6205884c30f563acb4a859608a2bd9f5b6c6;hpb=97fb6c2a140f361991541bcf5a5c1e5d18deaf74;p=rocksndiamonds.git

diff --git a/src/game_sp/main.c b/src/game_sp/main.c
index a29d6205..206ae571 100644
--- a/src/game_sp/main.c
+++ b/src/game_sp/main.c
@@ -9,17 +9,17 @@ struct LevelInfo_SP native_sp_level;
 int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
-int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
+int GfxFrameSP[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 
 
-void InitGameEngine_SP()
+void InitGameEngine_SP(void)
 {
   int x, y;
 
   gfx.anim_random_frame = -1;	// (use simple, ad-hoc random numbers)
 
-  game_sp.LevelSolved = FALSE;
-  game_sp.GameOver = FALSE;
+  game_sp.level_solved = FALSE;
+  game_sp.game_over = FALSE;
 
   game_sp.time_played = 0;
   game_sp.infotrons_still_needed = native_sp_level.header.InfotronsNeeded;
@@ -31,6 +31,11 @@ void InitGameEngine_SP()
   game_sp.scroll_xoffset = (EVEN(SCR_FIELDX) ? TILEX / 2 : 0);
   game_sp.scroll_yoffset = (EVEN(SCR_FIELDY) ? TILEY / 2 : 0);
 
+  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;
+
   for (x = 0; x < SP_MAX_PLAYFIELD_WIDTH; x++)
   {
     for (y = 0; y < SP_MAX_PLAYFIELD_HEIGHT; y++)
@@ -38,7 +43,7 @@ void InitGameEngine_SP()
       GfxElementLast[x][y] = -1;
       GfxGraphicLast[x][y] = -1;
       GfxGraphic[x][y] = -1;
-      GfxFrame[x][y] = 0;
+      GfxFrameSP[x][y] = 0;
     }
   }
 
@@ -49,37 +54,50 @@ void InitGameEngine_SP()
 
 void RedrawPlayfield_SP(boolean force_redraw)
 {
+  // skip redrawing playfield in warp mode or when testing tapes with "autotest"
+  if (DrawingDeactivatedField())
+    return;
+
   if (force_redraw)
     RestorePlayfield();
 
   UpdatePlayfield(force_redraw);
-
-  BackToFront_SP();
 }
 
-void DrawGameDoorValues_SP()
+static void UpdateGameDoorValues_SP(void)
 {
-  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)
 }
 
-void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
+void GameActions_SP(byte action[MAX_PLAYERS])
 {
   byte single_player_action = action[0];
   int x, y;
 
-  UpdateEngineValues(mScrollX / TILEX, mScrollY / TILEY);
+  UpdateEngineValues(mScrollX / TILEX, mScrollY / TILEY,
+		     MurphyScreenXPos / TILEX, MurphyScreenYPos / TILEY);
 
-  subMainGameLoop_Main(single_player_action, warp_mode);
+  subMainGameLoop_Main(single_player_action);
 
   RedrawPlayfield_SP(FALSE);
 
-  if (!warp_mode)		/* do not redraw values in warp mode */
-    DrawGameDoorValues_SP();
+  UpdateGameDoorValues_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]++;
+      GfxFrameSP[x][y]++;
+}
+
+int getRedDiskReleaseFlag_SP(void)
+{
+  // 0: when Murphy is moving (including the destination tile!)
+  // 1: when Murphy is not moving for at least one game frame
+
+  return RedDiskReleaseFlag;
 }