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 299a63b509b71ba835b250ee2071cb1d00dfc143..4486656ffd7864693ad47dec5923f471bb0c5d24 100644 (file)
--- a/src/game_sp/main.c
+++ b/src/game_sp/main.c
@@ -6,7 +6,6 @@
 struct GameInfo_SP game_sp;
 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];
@@ -27,7 +26,15 @@ void InitGameEngine_SP()
   game_sp.red_disk_count = 0;
   game_sp.score = 0;
 
-  menBorder.Checked = setup.sp_show_border_elements;
+  menBorder = setup.sp_show_border_elements;
+
+  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++)
   {
@@ -42,34 +49,11 @@ void InitGameEngine_SP()
 
   InitScrollPlayfield();
 
-#if 0
-  printf(":A: %d, %d [%d, %d]\n",
-        mScrollX, mScrollY, mScrollX_last, mScrollY_last);
-#endif
-
-#if 1
   menPlay_Click();
-#else
-  menPlayDemo_Click();
-#endif
-
-#if 0
-  printf(":B: %d, %d [%d, %d]\n",
-        mScrollX, mScrollY, mScrollX_last, mScrollY_last);
-#endif
-}
-
-#if 0
-void BlitScreenToBitmap_SP(Bitmap *target_bitmap)
-{
-  DDScrollBuffer_Blt_Ext(target_bitmap);
 }
-#endif
 
 void RedrawPlayfield_SP(boolean force_redraw)
 {
-  // subDisplayLevel();
-
   if (force_redraw)
     RestorePlayfield();
 
@@ -80,28 +64,10 @@ void RedrawPlayfield_SP(boolean force_redraw)
 
 void DrawGameDoorValues_SP()
 {
-#if 1
-
-  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)
-
-#else
-
-  int infotrons_still_needed = InfotronsNeeded;
-  int red_disks = RedDiskCount;
-  int no_score_in_supaplex = 0;
-#if 1
-  int level_time_played = TimerVar / setup.game_frame_delay;
-#else
-  int level_time_played = TimerVar / 35;       /* !!! CHECK THIS !!! */
-#endif
-  int no_keys_in_supaplex = 0;
-
-  DrawAllGameValues(infotrons_still_needed, red_disks, no_score_in_supaplex,
-                   level_time_played, no_keys_in_supaplex);
-#endif
 }
 
 void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
@@ -118,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;
+}