X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=6a8967685317b411cd256feb9d8fba756c639555;hb=e73321327b4e72d10bbd6ab307e75ae8afd1083f;hp=e7a139f45989aeef4e7baf5c25bea8c190fe5baf;hpb=05957f807db2ca72144aff82c8240357e47420a5;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index e7a139f4..6a896768 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3035,7 +3035,15 @@ static void InitGameEngine()
   game.scroll_delay_value =
     MIN(MAX(MIN_SCROLL_DELAY, game.scroll_delay_value), MAX_SCROLL_DELAY);
 
-  FreeEngineSnapshotList();
+  /* ---------- initialize game engine snapshots ---------------------------- */
+  for (i = 0; i < MAX_PLAYERS; i++)
+    game.snapshot.last_action[i] = 0;
+  game.snapshot.changed_action = FALSE;
+  game.snapshot.mode =
+    (strEqual(setup.engine_snapshot_mode, STR_SNAPSHOT_MODE_EVERY_STEP) ?
+     SNAPSHOT_MODE_EVERY_STEP :
+     strEqual(setup.engine_snapshot_mode, STR_SNAPSHOT_MODE_EVERY_MOVE) ?
+     SNAPSHOT_MODE_EVERY_MOVE : SNAPSHOT_MODE_OFF);
 }
 
 int get_num_special_action(int element, int action_first, int action_last)
@@ -3908,8 +3916,6 @@ void InitGame()
 
   /* blit playfield from scroll buffer to normal back buffer for fading in */
   BlitScreenToBitmap(backbuffer);
-
-  redraw_mask |= REDRAW_FROM_BACKBUFFER;
   /* !!! FIX THIS (END) !!! */
 
   FadeIn(REDRAW_FIELD);
@@ -3997,7 +4003,7 @@ void InitGame()
 
   game.restart_level = FALSE;
 
-  SaveEngineSnapshotToList();
+  SaveEngineSnapshotToListInitial();
 }
 
 void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y)
@@ -4384,13 +4390,16 @@ void GameEnd()
 
   local_player->LevelSolved_GameEnd = TRUE;
 
-  CloseDoor(DOOR_CLOSE_1);
+  if (!global.use_envelope_request)
+    CloseDoor(DOOR_CLOSE_1);
 
   if (local_player->LevelSolved_SaveTape)
   {
     SaveTapeChecked(tape.level_nr);	/* ask to save tape */
   }
 
+  CloseDoor(DOOR_CLOSE_ALL);
+
   if (level_editor_test_game)
   {
     game_status = GAME_MODE_MAIN;
@@ -4425,6 +4434,9 @@ void GameEnd()
   {
     game_status = GAME_MODE_SCORES;
 
+    /* needed if different viewport properties defined for scores */
+    ChangeViewportPropertiesIfNeeded();
+
     DrawHallOfFame(hi_pos);
 
     if (raise_level)
@@ -10686,7 +10698,8 @@ static void CheckSaveEngineSnapshot(struct PlayerInfo *player)
       (player->is_snapping && !player_was_snapping) ||
       (player->is_dropping && !player_was_dropping))
   {
-    SaveEngineSnapshotToList();
+    if (!SaveEngineSnapshotToList())
+      return;
 
     player_was_moving = FALSE;
     player_was_snapping = TRUE;
@@ -10955,6 +10968,23 @@ void GameActions()
   byte tape_action[MAX_PLAYERS];
   int i;
 
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    struct PlayerInfo *player = &stored_player[i];
+
+    // allow engine snapshot if movement attempt was stopped
+    if ((game.snapshot.last_action[i] & KEY_MOTION) != 0 &&
+	(player->action & KEY_MOTION) == 0)
+      game.snapshot.changed_action = TRUE;
+
+    // allow engine snapshot in case of snapping/dropping attempt
+    if ((game.snapshot.last_action[i] & KEY_BUTTON) == 0 &&
+	(player->action & KEY_BUTTON) != 0)
+      game.snapshot.changed_action = TRUE;
+
+    game.snapshot.last_action[i] = player->action;
+  }
+
   /* detect endless loops, caused by custom element programming */
   if (recursion_loop_detected && recursion_loop_depth == 0)
   {
@@ -11162,7 +11192,32 @@ void GameActions()
   }
   else
   {
-    GameActions_RND();
+    GameActions_RND_Main();
+  }
+
+  BlitScreenToBitmap(backbuffer);
+
+  CheckLevelTime();
+
+  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
+
+  if (options.debug)			/* calculate frames per second */
+  {
+    static unsigned int fps_counter = 0;
+    static int fps_frames = 0;
+    unsigned int fps_delay_ms = Counter() - fps_counter;
+
+    fps_frames++;
+
+    if (fps_delay_ms >= 500)	/* calculate fps every 0.5 seconds */
+    {
+      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
+
+      fps_frames = 0;
+      fps_counter = Counter();
+    }
+
+    redraw_mask |= REDRAW_FPS;
   }
 }
 
@@ -11176,10 +11231,6 @@ void GameActions_EM_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_EM(effective_action, warp_mode);
-
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
 }
 
 void GameActions_SP_Main()
@@ -11192,10 +11243,11 @@ void GameActions_SP_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_SP(effective_action, warp_mode);
+}
 
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
+void GameActions_RND_Main()
+{
+  GameActions_RND();
 }
 
 void GameActions_RND()
@@ -11697,32 +11749,9 @@ void GameActions_RND()
   }
 #endif
 
-  CheckLevelTime();
-
   DrawAllPlayers();
   PlayAllPlayersSound();
 
-  if (options.debug)			/* calculate frames per second */
-  {
-    static unsigned int fps_counter = 0;
-    static int fps_frames = 0;
-    unsigned int fps_delay_ms = Counter() - fps_counter;
-
-    fps_frames++;
-
-    if (fps_delay_ms >= 500)	/* calculate fps every 0.5 seconds */
-    {
-      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
-
-      fps_frames = 0;
-      fps_counter = Counter();
-    }
-
-    redraw_mask |= REDRAW_FPS;
-  }
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
-
   if (local_player->show_envelope != 0 && local_player->MovPos == 0)
   {
     ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1);
@@ -11776,16 +11805,16 @@ static boolean AllPlayersInVisibleScreen()
 
 void ScrollLevel(int dx, int dy)
 {
-  int softscroll_offset = (setup.soft_scrolling ? 2 * TILEX_VAR : 0);
+  int scroll_offset = 2 * TILEX_VAR;
   int x, y;
 
   BlitBitmap(drawto_field, drawto_field,
-	     FX + TILEX_VAR * (dx == -1) - softscroll_offset,
-	     FY + TILEY_VAR * (dy == -1) - softscroll_offset,
-	     SXSIZE - TILEX_VAR * (dx != 0) + 2 * softscroll_offset,
-	     SYSIZE - TILEY_VAR * (dy != 0) + 2 * softscroll_offset,
-	     FX + TILEX_VAR * (dx == 1) - softscroll_offset,
-	     FY + TILEY_VAR * (dy == 1) - softscroll_offset);
+	     FX + TILEX_VAR * (dx == -1) - scroll_offset,
+	     FY + TILEY_VAR * (dy == -1) - scroll_offset,
+	     SXSIZE - TILEX_VAR * (dx != 0) + 2 * scroll_offset,
+	     SYSIZE - TILEY_VAR * (dy != 0) + 2 * scroll_offset,
+	     FX + TILEX_VAR * (dx == 1) - scroll_offset,
+	     FY + TILEY_VAR * (dy == 1) - scroll_offset);
 
   if (dx != 0)
   {
@@ -14694,11 +14723,6 @@ ListNode *SaveEngineSnapshotBuffers()
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(scroll_x));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(scroll_y));
 
-  /* save level identification information */
-
-  setString(&snapshot_level_identifier, leveldir_current->identifier);
-  snapshot_level_nr = level_nr;
-
 #if 0
   ListNode *node = engine_snapshot_list_rnd;
   int num_bytes = 0;
@@ -14722,14 +14746,45 @@ void SaveEngineSnapshotSingle()
 
   /* finally save all snapshot buffers to single snapshot */
   SaveSnapshotSingle(buffers);
+
+  /* save level identification information */
+  setString(&snapshot_level_identifier, leveldir_current->identifier);
+  snapshot_level_nr = level_nr;
 }
 
-void SaveEngineSnapshotToList()
+static boolean SaveEngineSnapshotToListExt(boolean initial_snapshot)
 {
+  boolean save_snapshot =
+    (initial_snapshot ||
+     (game.snapshot.mode == SNAPSHOT_MODE_EVERY_STEP) ||
+     (game.snapshot.mode == SNAPSHOT_MODE_EVERY_MOVE &&
+      game.snapshot.changed_action));
+
+  game.snapshot.changed_action = FALSE;
+
+  if (game.snapshot.mode == SNAPSHOT_MODE_OFF ||
+      tape.quick_resume ||
+      !save_snapshot)
+    return FALSE;
+
   ListNode *buffers = SaveEngineSnapshotBuffers();
 
   /* finally save all snapshot buffers to snapshot list */
   SaveSnapshotToList(buffers);
+
+  return TRUE;
+}
+
+boolean SaveEngineSnapshotToList()
+{
+  return SaveEngineSnapshotToListExt(FALSE);
+}
+
+void SaveEngineSnapshotToListInitial()
+{
+  FreeEngineSnapshotList();
+
+  SaveEngineSnapshotToListExt(TRUE);
 }
 
 void LoadEngineSnapshotValues()
@@ -14765,12 +14820,17 @@ void LoadEngineSnapshot_Redo(int steps)
   LoadEngineSnapshotValues();
 }
 
-boolean CheckEngineSnapshot()
+boolean CheckEngineSnapshotSingle()
 {
   return (strEqual(snapshot_level_identifier, leveldir_current->identifier) &&
 	  snapshot_level_nr == level_nr);
 }
 
+boolean CheckEngineSnapshotList()
+{
+  return CheckSnapshotList();
+}
+
 
 /* ---------- new game button stuff ---------------------------------------- */
 
@@ -14915,22 +14975,48 @@ void FreeGameButtons()
     FreeGadget(game_gadget[i]);
 }
 
-void MapStopPlayButtons()
+static void MapGameButtonsAtSamePosition(int id)
 {
-  UnmapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
-  UnmapGadget(game_gadget[GAME_CTRL_ID_REDO]);
+  int i;
 
-  MapGadget(game_gadget[GAME_CTRL_ID_STOP]);
-  MapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
+    if (i != id &&
+	gamebutton_info[i].pos->x == gamebutton_info[id].pos->x &&
+	gamebutton_info[i].pos->y == gamebutton_info[id].pos->y)
+      MapGadget(game_gadget[i]);
+}
+
+static void UnmapGameButtonsAtSamePosition(int id)
+{
+  int i;
+
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
+    if (i != id &&
+	gamebutton_info[i].pos->x == gamebutton_info[id].pos->x &&
+	gamebutton_info[i].pos->y == gamebutton_info[id].pos->y)
+      UnmapGadget(game_gadget[i]);
 }
 
 void MapUndoRedoButtons()
 {
-  UnmapGadget(game_gadget[GAME_CTRL_ID_STOP]);
-  UnmapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+  UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
+  UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
+  UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_PLAY);
 
   MapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
   MapGadget(game_gadget[GAME_CTRL_ID_REDO]);
+  MapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+}
+
+void UnmapUndoRedoButtons()
+{
+  UnmapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
+  UnmapGadget(game_gadget[GAME_CTRL_ID_REDO]);
+  UnmapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+
+  MapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
+  MapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
+  MapGameButtonsAtSamePosition(GAME_CTRL_ID_PLAY);
 }
 
 void MapGameButtons()
@@ -14939,7 +15025,8 @@ void MapGameButtons()
 
   for (i = 0; i < NUM_GAME_BUTTONS; i++)
     if (i != GAME_CTRL_ID_UNDO &&
-	i != GAME_CTRL_ID_REDO)
+	i != GAME_CTRL_ID_REDO &&
+	i != GAME_CTRL_ID_PLAY)
       MapGadget(game_gadget[i]);
 }
 
@@ -14971,15 +15058,18 @@ void GameUndoRedoExt()
   RedrawPlayfield();
   UpdateAndDisplayGameControlValues();
 
+  DrawCompleteVideoDisplay();
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, TapeTime);
   DrawVideoDisplay(VIDEO_STATE_FRAME_ON, FrameCounter);
+  DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON :
+		    VIDEO_STATE_1STEP_OFF), 0);
 
   BackToFront();
 }
 
 void GameUndo(int steps)
 {
-  if (!CheckEngineSnapshot())
+  if (!CheckEngineSnapshotList())
     return;
 
   LoadEngineSnapshot_Undo(steps);
@@ -14989,7 +15079,7 @@ void GameUndo(int steps)
 
 void GameRedo(int steps)
 {
-  if (!CheckEngineSnapshot())
+  if (!CheckEngineSnapshotList())
     return;
 
   LoadEngineSnapshot_Redo(steps);
@@ -15046,10 +15136,7 @@ static void HandleGameButtonsExt(int id, int button)
 	  SendToServer_ContinuePlaying();
 	else
 #endif
-	{
-	  tape.pausing = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF, 0);
-	}
+	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
       break;