added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index e9b7f4cc65e7018d43d4a08ae7c2799739b32164..f16e7ec9451a20ab68068add00155ed01870088a 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -664,6 +664,7 @@ void TapeErase(void)
   tape.level_nr = level_nr;
   tape.pos[tape.counter].delay = 0;
   tape.changed = TRUE;
+  tape.solved = FALSE;
 
   tape.random_seed = InitRND(level.random_seed);
 
@@ -760,6 +761,7 @@ static void TapeAppendRecording(void)
   // start recording
   tape.recording = TRUE;
   tape.changed = TRUE;
+  tape.solved = FALSE;
 
   // set current delay (for last played move)
   tape.pos[tape.counter].delay = tape.delay_played;
@@ -777,7 +779,9 @@ static void TapeAppendRecording(void)
 
 void TapeHaltRecording(void)
 {
-  tape.counter++;
+  // only advance tape counter if any input events have been recorded
+  if (tape.pos[tape.counter].delay > 0)
+    tape.counter++;
 
   // initialize delay for next tape entry (to be able to continue recording)
   if (tape.counter < MAX_TAPE_LEN)
@@ -832,6 +836,8 @@ boolean TapeAddAction(byte action[MAX_TAPE_ACTIONS])
     tape.pos[tape.counter].delay++;
   }
 
+  tape.changed = TRUE;
+
   return TRUE;
 }
 
@@ -930,6 +936,10 @@ void TapeTogglePause(boolean toggle_mode)
 
     ModifyPauseButtons();
   }
+
+  // stop tape when leaving auto-pause after completely replaying tape
+  if (tape.playing && !tape.pausing && tape.counter >= tape.length)
+    TapeStop();
 }
 
 void TapeStartPlaying(void)
@@ -992,16 +1002,22 @@ byte *TapePlayAction(void)
       TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
 
+      if (setup.autorecord_after_replay)
+       TapeAppendRecording();
+
       return NULL;
     }
   }
 
   if (tape.counter >= tape.length)     // end of tape reached
   {
-    if (tape.warp_forward && !tape.auto_play)
+    if (!tape.auto_play)
     {
       TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
+      if (setup.autorecord_after_replay)
+       TapeAppendRecording();
     }
     else
     {
@@ -1177,22 +1193,25 @@ static void TapeSingleStep(void)
 
 void TapeQuickSave(void)
 {
-  if (game_status == GAME_MODE_MAIN)
+  if (game_status != GAME_MODE_PLAYING)
   {
-    Request("No game that can be saved!", REQ_CONFIRM);
+    Request("No game that could be saved!", REQ_CONFIRM);
 
     return;
   }
 
-  if (game_status != GAME_MODE_PLAYING)
+  if (!tape.recording)
+  {
+    Request("No recording that could be saved!", REQ_CONFIRM);
+
     return;
+  }
 
-  if (tape.recording)
-    TapeHaltRecording();       // prepare tape for saving on-the-fly
+  TapeHaltRecording();         // prepare tape for saving on-the-fly
 
   if (TAPE_IS_EMPTY(tape))
   {
-    Request("No tape that can be saved!", REQ_CONFIRM);
+    Request("No tape that could be saved!", REQ_CONFIRM);
 
     return;
   }
@@ -1380,15 +1399,14 @@ boolean PlaySolutionTape(void)
 
 static boolean PlayScoreTape_WaitForDownload(void)
 {
-  unsigned int download_delay = 0;
-  unsigned int download_delay_value = 10000;
+  DelayCounter download_delay = { 10000 };
 
   ResetDelayCounter(&download_delay);
 
   // wait for score tape to be successfully downloaded (and fail on timeout)
   while (!server_scores.tape_downloaded)
   {
-    if (DelayReached(&download_delay, download_delay_value))
+    if (DelayReached(&download_delay))
       return FALSE;
 
     UPDATE_BUSY_STATE_NOT_LOADING();
@@ -1402,11 +1420,20 @@ static boolean PlayScoreTape_WaitForDownload(void)
 boolean PlayScoreTape(int entry_nr)
 {
   struct ScoreEntry *entry = &scores.entry[entry_nr];
-  char *tape_filename = getScoreTapeFilename(entry->tape_basename, level_nr);
+  char *tape_filename =
+    (entry->id == -1 ?
+     getScoreTapeFilename(entry->tape_basename, level_nr) :
+     getScoreCacheTapeFilename(entry->tape_basename, level_nr));
   boolean download_tape = (!fileExists(tape_filename));
 
   if (download_tape && entry->id == -1)
+  {
+    FadeSkipNextFadeIn();
+
+    Request("Cannot find score tape!", REQ_CONFIRM);
+
     return FALSE;
+  }
 
   server_scores.tape_downloaded = FALSE;
 
@@ -1433,7 +1460,10 @@ boolean PlayScoreTape(int entry_nr)
   // if tape recorder already contains a tape, remove it without asking
   TapeErase();
 
-  LoadScoreTape(entry->tape_basename, level_nr);
+  if (entry->id == -1)
+    LoadScoreTape(entry->tape_basename, level_nr);
+  else
+    LoadScoreCacheTape(entry->tape_basename, level_nr);
 
   if (TAPE_IS_EMPTY(tape))
   {
@@ -1566,15 +1596,14 @@ static void AutoPlayTapes_SetScoreEntry(int score, int time)
 
 static boolean AutoPlayTapes_WaitForUpload(void)
 {
-  unsigned int upload_delay = 0;
-  unsigned int upload_delay_value = 10000;
+  DelayCounter upload_delay = { 10000 };
 
   ResetDelayCounter(&upload_delay);
 
   // wait for score tape to be successfully uploaded (and fail on timeout)
   while (!server_scores.uploaded)
   {
-    if (DelayReached(&upload_delay, upload_delay_value))
+    if (DelayReached(&upload_delay))
     {
       PrintNoLog("\r");
       Print("- uploading score tape to score server - TIMEOUT.\n");