X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=f16e7ec9451a20ab68068add00155ed01870088a;hp=7403be0f042dd7af216ed8c226cff5c919713be3;hb=HEAD;hpb=aeffe316860a47217d9b5074ade03cebda8730c9

diff --git a/src/tape.c b/src/tape.c
index 7403be0f..f16e7ec9 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -18,6 +18,8 @@
 #include "files.h"
 #include "network.h"
 #include "anim.h"
+#include "api.h"
+
 
 #define DEBUG_TAPE_WHEN_PLAYING			FALSE
 
@@ -471,8 +473,44 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 // tape logging functions
 // ============================================================================
 
+struct AutoPlayInfo
+{
+  LevelDirTree *leveldir;
+  boolean all_levelsets;
+  int last_level_nr;
+  int level_nr;
+  int num_levels_played;
+  int num_levels_solved;
+  int num_tapes_patched;
+  int num_tape_missing;
+  boolean level_failed[MAX_TAPES_PER_SET];
+  char *tape_filename;
+};
+
 static char tape_patch_info[MAX_OUTPUT_LINESIZE];
 
+static void PrintTapeReplayHeader(struct AutoPlayInfo *autoplay)
+{
+  PrintLine("=", 79);
+
+  if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+    Print("Automatically fixing level tapes\n");
+  else if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+    Print("Automatically uploading level tapes\n");
+  else
+    Print("Automatically playing level tapes\n");
+
+  PrintLine("-", 79);
+  Print("Level series identifier: '%s'\n", autoplay->leveldir->identifier);
+  Print("Level series name:       '%s'\n", autoplay->leveldir->name);
+  Print("Level series author:     '%s'\n", autoplay->leveldir->author);
+  Print("Number of levels:        %d\n",   autoplay->leveldir->levels);
+  PrintLine("=", 79);
+  Print("\n");
+
+  DrawInitTextItem(autoplay->leveldir->name);
+}
+
 static void PrintTapeReplayProgress(boolean replay_finished)
 {
   static unsigned int counter_last = -1;
@@ -513,6 +551,58 @@ static void PrintTapeReplayProgress(boolean replay_finished)
   }
 }
 
+static void PrintTapeReplaySummary(struct AutoPlayInfo *autoplay)
+{
+  char *autoplay_status =
+    (autoplay->num_levels_played == autoplay->num_levels_solved &&
+     autoplay->num_levels_played > 0 ? " OK " : "WARN");
+  int autoplay_percent =
+    (autoplay->num_levels_played ?
+     autoplay->num_levels_solved * 100 / autoplay->num_levels_played : 0);
+  int i;
+
+  Print("\n");
+  PrintLine("=", 79);
+  Print("Number of levels played: %d\n", autoplay->num_levels_played);
+  Print("Number of levels solved: %d (%d%%)\n", autoplay->num_levels_solved,
+	(autoplay->num_levels_played ?
+	 autoplay->num_levels_solved * 100 / autoplay->num_levels_played : 0));
+  if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+    Print("Number of tapes fixed: %d\n", autoplay->num_tapes_patched);
+  PrintLine("-", 79);
+  Print("Summary (for automatic parsing by scripts):\n");
+
+  if (autoplay->tape_filename)
+  {
+    Print("TAPEFILE [%s] '%s', %d, %d, %d",
+	  autoplay_status,
+	  autoplay->leveldir->identifier,
+	  autoplay->last_level_nr,
+	  game.score_final,
+	  game.score_time_final);
+  }
+  else
+  {
+    Print("LEVELDIR [%s] '%s', SOLVED %d/%d (%d%%)",
+	  autoplay_status,
+	  autoplay->leveldir->identifier,
+	  autoplay->num_levels_solved,
+	  autoplay->num_levels_played,
+	  autoplay_percent);
+
+    if (autoplay->num_levels_played != autoplay->num_levels_solved)
+    {
+      Print(", FAILED:");
+      for (i = 0; i < MAX_TAPES_PER_SET; i++)
+	if (autoplay->level_failed[i])
+	  Print(" %03d", i);
+    }
+  }
+
+  Print("\n");
+  PrintLine("=", 79);
+}
+
 static FILE *tape_log_file;
 
 static void OpenTapeLogfile(void)
@@ -574,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);
 
@@ -581,6 +672,8 @@ void TapeErase(void)
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 
+  tape.property_bits = TAPE_PROPERTY_NONE;
+
   TapeSetDateFromNow();
 
   for (i = 0; i < MAX_PLAYERS; i++)
@@ -668,10 +761,13 @@ 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;
 
+  tape.property_bits |= TAPE_PROPERTY_REPLAYED;
+
   // set current date
   TapeSetDateFromNow();
 
@@ -683,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)
@@ -738,6 +836,8 @@ boolean TapeAddAction(byte action[MAX_TAPE_ACTIONS])
     tape.pos[tape.counter].delay++;
   }
 
+  tape.changed = TRUE;
+
   return TRUE;
 }
 
@@ -762,6 +862,12 @@ void TapeRecordAction(byte action_raw[MAX_TAPE_ACTIONS])
     tape.set_centered_player = FALSE;
   }
 
+  if (GameFrameDelay != GAME_FRAME_DELAY)
+    tape.property_bits |= TAPE_PROPERTY_GAME_SPEED;
+
+  if (setup.small_game_graphics || SCR_FIELDX >= 2 * SCR_FIELDX_DEFAULT)
+    tape.property_bits |= TAPE_PROPERTY_SMALL_GRAPHICS;
+
   if (!TapeAddAction(action))
     TapeStopRecording();
 }
@@ -783,6 +889,12 @@ void TapeTogglePause(boolean toggle_mode)
   if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL))
     tape.single_step = FALSE;
 
+  if (tape.single_step)
+    tape.property_bits |= TAPE_PROPERTY_SINGLE_STEP;
+
+  if (tape.pausing)
+    tape.property_bits |= TAPE_PROPERTY_PAUSE_MODE;
+
   DrawVideoDisplayCurrentState();
 
   if (tape.deactivate_display)
@@ -812,16 +924,22 @@ void TapeTogglePause(boolean toggle_mode)
 
   if (game_status == GAME_MODE_PLAYING)
   {
-    if (setup.show_snapshot_buttons && CheckEngineSnapshotList())
+    if (setup.show_load_save_buttons &&
+	setup.show_undo_redo_buttons &&
+	CheckEngineSnapshotList())
     {
       if (tape.pausing)
 	MapUndoRedoButtons();
       else if (!tape.single_step)
-	UnmapUndoRedoButtons();
+	MapLoadSaveButtons();
     }
 
     ModifyPauseButtons();
   }
+
+  // stop tape when leaving auto-pause after completely replaying tape
+  if (tape.playing && !tape.pausing && tape.counter >= tape.length)
+    TapeStop();
 }
 
 void TapeStartPlaying(void)
@@ -879,21 +997,27 @@ byte *TapePlayAction(void)
 
   if (tape.pause_before_end)  // stop some seconds before end of tape
   {
-    if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+    if (TapeTime > (int)tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
       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
     {
@@ -982,6 +1106,27 @@ void TapeStop(void)
   }
 }
 
+static void TapeStopGameOrTape(boolean stop_game)
+{
+  if (score_info_tape_play || (!tape.playing && stop_game))
+    RequestQuitGame(FALSE);
+  else
+    TapeStop();
+}
+
+void TapeStopGame(void)
+{
+  if (game_status == GAME_MODE_MAIN)
+    return;
+
+  TapeStopGameOrTape(TRUE);
+}
+
+void TapeStopTape(void)
+{
+  TapeStopGameOrTape(FALSE);
+}
+
 unsigned int GetTapeLengthFrames(void)
 {
   unsigned int tape_length_frames = 0;
@@ -1048,26 +1193,31 @@ 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;
   }
 
+  tape.property_bits |= TAPE_PROPERTY_SNAPSHOT;
+
   if (SaveTapeChecked(tape.level_nr))
     SaveEngineSnapshotSingle();
 }
@@ -1126,6 +1276,7 @@ void TapeQuickLoad(void)
     TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY);
 
     tape.quick_resume = TRUE;
+    tape.property_bits |= TAPE_PROPERTY_SNAPSHOT;
   }
   else	// this should not happen (basically checked above)
   {
@@ -1135,6 +1286,69 @@ void TapeQuickLoad(void)
   }
 }
 
+static boolean checkRestartGame(char *message)
+{
+  if (game_status == GAME_MODE_MAIN)
+    return TRUE;
+
+  if (!hasStartedNetworkGame())
+    return FALSE;
+
+  if (level_editor_test_game)
+    return TRUE;
+
+  if (game.all_players_gone)
+    return TRUE;
+
+  if (!setup.ask_on_quit_game)
+    return TRUE;
+
+  if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
+    return TRUE;
+
+  OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+
+  return FALSE;
+}
+
+void TapeRestartGame(void)
+{
+  if (score_info_tape_play)
+  {
+    TapeStartGamePlaying();
+
+    return;
+  }
+
+  if (!checkRestartGame("Restart game?"))
+    return;
+
+  StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+}
+
+void TapeReplayAndPauseBeforeEnd(void)
+{
+  if (score_info_tape_play)
+    return;
+
+  if (TAPE_IS_EMPTY(tape) && !tape.recording)
+  {
+    Request("No tape for this level!", REQ_CONFIRM);
+
+    return;
+  }
+
+  if (!checkRestartGame("Replay game and pause before end?"))
+    return;
+
+  TapeStop();
+  TapeStartGamePlaying();
+  TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY);
+
+  tape.pause_before_end = TRUE;
+  tape.quick_resume = TRUE;
+}
+
 boolean hasSolutionTape(void)
 {
   boolean tape_file_exists = fileExists(getSolutionTapeFilename(level_nr));
@@ -1183,6 +1397,93 @@ boolean PlaySolutionTape(void)
   return TRUE;
 }
 
+static boolean PlayScoreTape_WaitForDownload(void)
+{
+  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))
+      return FALSE;
+
+    UPDATE_BUSY_STATE_NOT_LOADING();
+
+    Delay(20);
+  }
+
+  return TRUE;
+}
+
+boolean PlayScoreTape(int entry_nr)
+{
+  struct ScoreEntry *entry = &scores.entry[entry_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;
+
+  if (download_tape)
+    ApiGetScoreTapeAsThread(level_nr, entry->id, entry->tape_basename);
+
+  SetGameStatus(GAME_MODE_PLAYING);
+
+  FadeOut(REDRAW_FIELD);
+
+  if (download_tape && !PlayScoreTape_WaitForDownload())
+  {
+    SetGameStatus(GAME_MODE_SCOREINFO);
+    ClearField();
+
+    Request("Cannot download score tape from score server!", REQ_CONFIRM);
+
+    return FALSE;
+  }
+
+  if (!TAPE_IS_STOPPED(tape))
+    TapeStop();
+
+  // if tape recorder already contains a tape, remove it without asking
+  TapeErase();
+
+  if (entry->id == -1)
+    LoadScoreTape(entry->tape_basename, level_nr);
+  else
+    LoadScoreCacheTape(entry->tape_basename, level_nr);
+
+  if (TAPE_IS_EMPTY(tape))
+  {
+    SetGameStatus(GAME_MODE_SCOREINFO);
+    ClearField();
+
+    Request("Cannot load score tape for this level!", REQ_CONFIRM);
+
+    return FALSE;
+  }
+
+  FadeSkipNextFadeOut();
+
+  TapeStartGamePlaying();
+
+  score_info_tape_play = TRUE;
+
+  return TRUE;
+}
+
 static boolean checkTapesFromSameLevel(struct TapeInfo *t1, struct TapeInfo *t2)
 {
   return (strEqual(t1->level_identifier, t2->level_identifier) &&
@@ -1250,18 +1551,84 @@ void FixTape_ForceSinglePlayer(void)
 // tape autoplay functions
 // ----------------------------------------------------------------------------
 
-void AutoPlayTapes(void)
+static TreeInfo *getNextValidAutoPlayEntry(TreeInfo *node)
 {
-  static LevelDirTree *autoplay_leveldir = NULL;
-  static boolean autoplay_initialized = FALSE;
-  static int autoplay_last_level_nr = -1;
-  static int autoplay_level_nr = -1;
-  static int num_levels_played = 0;
-  static int num_levels_solved = 0;
-  static int num_tapes_patched = 0;
-  static int num_tape_missing = 0;
-  static boolean level_failed[MAX_TAPES_PER_SET];
-  static char *tape_filename = NULL;
+  node = getNextValidTreeInfoEntry(node);
+
+  while (node && node->is_copy)
+    node = getNextValidTreeInfoEntry(node);
+
+  return node;
+}
+
+static TreeInfo *getFirstValidAutoPlayEntry(TreeInfo *node)
+{
+  node = getFirstValidTreeInfoEntry(node);
+
+  if (node && node->is_copy)
+    return getNextValidAutoPlayEntry(node);
+
+  return node;
+}
+
+static void AutoPlayTapes_SetScoreEntry(int score, int time)
+{
+  char *name = (options.mytapes ? setup.player_name : options.player_name);
+
+  // set unique basename for score tape (for uploading to score server)
+  strcpy(tape.score_tape_basename, getScoreTapeBasename(name));
+
+  // store score in first score entry
+  scores.last_added = 0;
+
+  struct ScoreEntry *entry = &scores.entry[scores.last_added];
+
+  strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
+  strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
+
+  entry->score = score;
+  entry->time = time;
+
+  PrintNoLog("- uploading score tape to score server ... ");
+
+  server_scores.uploaded = FALSE;
+}
+
+static boolean AutoPlayTapes_WaitForUpload(void)
+{
+  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))
+    {
+      PrintNoLog("\r");
+      Print("- uploading score tape to score server - TIMEOUT.\n");
+
+      if (program.headless)
+	Fail("cannot upload score tape to score server");
+
+      return FALSE;
+    }
+
+    UPDATE_BUSY_STATE();
+
+    Delay(20);
+  }
+
+  PrintNoLog("\r");
+  Print("- uploading score tape to score server - uploaded.\n");
+
+  return TRUE;
+}
+
+static int AutoPlayTapesExt(boolean initialize)
+{
+  static struct AutoPlayInfo autoplay;
+  static int num_tapes = 0;
   static int patch_nr = 0;
   static char *patch_name[] =
   {
@@ -1295,9 +1662,12 @@ void AutoPlayTapes(void)
 
     -1
   };
+  LevelDirTree *leveldir_current_last = leveldir_current;
+  boolean init_level_set = FALSE;
+  int level_nr_last = level_nr;
   int i;
 
-  if (autoplay_initialized)
+  if (!initialize)
   {
     if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
     {
@@ -1316,7 +1686,7 @@ void AutoPlayTapes(void)
 	  SaveTapeToFilename(filename);
 
 	  tape.auto_play_level_fixed = TRUE;
-	  num_tapes_patched++;
+	  autoplay.num_tapes_patched++;
 	}
 
 	// continue with next tape
@@ -1344,19 +1714,7 @@ void AutoPlayTapes(void)
     if (global.autoplay_mode == AUTOPLAY_MODE_SAVE &&
 	tape.auto_play_level_solved)
     {
-      // set unique basename for score tape (for uploading to score server)
-      strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name));
-
-      // store score in first score entry
-      scores.last_added = 0;
-
-      struct ScoreEntry *entry = &scores.entry[scores.last_added];
-
-      strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
-      strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
-
-      entry->score = game.score_final;
-      entry->time = game.score_time_final;
+      AutoPlayTapes_SetScoreEntry(game.score_final, game.score_time_final);
 
       if (leveldir_current)
       {
@@ -1369,125 +1727,202 @@ void AutoPlayTapes(void)
 	tape.level_nr = level_nr;
       }
 
-      PrintNoLog("- uploading score tape to score server ... ");
-
-      server_scores.uploaded = FALSE;
-
       // save score tape to upload to server; may be required for some reasons:
       // * level set identifier in solution tapes may differ from level set
+      // * level set identifier is missing (old-style tape without INFO chunk)
       // * solution tape may have native format (like Supaplex solution files)
 
       SaveScoreTape(level_nr);
-      SaveServerScore(level_nr);
-
-      unsigned int upload_delay = 0;
-      unsigned int upload_delay_value = 10000;
-
-      ResetDelayCounter(&upload_delay);
+      SaveServerScore(level_nr, TRUE);
 
-      // wait for score tape to be successfully uploaded (and fail on timeout)
-      while (!server_scores.uploaded)
-      {
-	if (DelayReached(&upload_delay, upload_delay_value))
-	{
-	  PrintNoLog("\r");
-	  Print("- uploading score tape to score server - TIMEOUT.\n");
-
-	  Fail("cannot upload score tape to score server");
-	}
-
-	Delay(20);
-      }
-
-      PrintNoLog("\r");
-      Print("- uploading score tape to score server - uploaded.\n");
+      AutoPlayTapes_WaitForUpload();
     }
 
     if (patch_nr == 0)
-      num_levels_played++;
+      autoplay.num_levels_played++;
 
     if (tape.auto_play_level_solved)
-      num_levels_solved++;
+      autoplay.num_levels_solved++;
 
     if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
-      level_failed[level_nr] = !tape.auto_play_level_solved;
+      autoplay.level_failed[level_nr] = !tape.auto_play_level_solved;
   }
   else
   {
-    DrawCompleteVideoDisplay();
+    if (strEqual(global.autoplay_leveldir, "ALL"))
+    {
+      autoplay.all_levelsets = TRUE;
 
-    audio.sound_enabled = FALSE;
-    setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
+      // tape mass-uploading only allowed for private tapes
+      if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+	options.mytapes = TRUE;
+    }
+
+    if ((global.autoplay_mode == AUTOPLAY_MODE_SAVE ||
+	 global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) &&
+	!options.mytapes &&
+	options.player_name == NULL)
+    {
+      Fail("specify player name when uploading solution tapes");
+    }
+
+    if (global.autoplay_mode != AUTOPLAY_MODE_UPLOAD)
+      DrawCompleteVideoDisplay();
+
+    if (program.headless)
+    {
+      audio.sound_enabled = FALSE;
+      setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
+    }
 
     if (strSuffix(global.autoplay_leveldir, ".tape"))
     {
-      tape_filename = global.autoplay_leveldir;
+      autoplay.tape_filename = global.autoplay_leveldir;
+
+      if (!fileExists(autoplay.tape_filename))
+	Fail("tape file '%s' does not exist", autoplay.tape_filename);
 
-      LoadTapeFromFilename(tape_filename);
+      LoadTapeFromFilename(autoplay.tape_filename);
 
       if (tape.no_valid_file)
-      {
-	if (!fileExists(tape_filename))
-	  Fail("tape file '%s' does not exist", tape_filename);
-	else
-	  Fail("cannot load tape file '%s'", tape_filename);
-      }
+	Fail("cannot load tape file '%s'", autoplay.tape_filename);
+
+      if (tape.no_info_chunk && !options.identifier)
+	Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename);
+
+      if (tape.no_info_chunk && !options.level_nr)
+	Fail("cannot get level nr from tape file '%s'", autoplay.tape_filename);
 
       global.autoplay_leveldir = tape.level_identifier;
 
+      if (options.identifier != NULL)
+	global.autoplay_leveldir = options.identifier;
+
+      if (options.level_nr != NULL)
+	tape.level_nr = atoi(options.level_nr);
+
       if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET)
         global.autoplay_level[tape.level_nr] = TRUE;
 
       global.autoplay_all = FALSE;
+      options.mytapes = FALSE;
     }
 
-    autoplay_leveldir = getTreeInfoFromIdentifier(leveldir_first,
-						  global.autoplay_leveldir);
-
-    if (autoplay_leveldir == NULL)
-      Fail("no such level identifier: '%s'", global.autoplay_leveldir);
-
-    leveldir_current = autoplay_leveldir;
-
-    if (autoplay_leveldir->first_level < 0)
-      autoplay_leveldir->first_level = 0;
-    if (autoplay_leveldir->last_level >= MAX_TAPES_PER_SET)
-      autoplay_leveldir->last_level = MAX_TAPES_PER_SET - 1;
-
-    autoplay_level_nr = autoplay_leveldir->first_level;
-
-    PrintLine("=", 79);
-    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
-      Print("Automatically fixing level tapes\n");
-    else if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
-      Print("Automatically uploading level tapes\n");
+    if (autoplay.all_levelsets)
+    {
+      // start auto-playing first level set
+      autoplay.leveldir = getFirstValidAutoPlayEntry(leveldir_first);
+    }
     else
-      Print("Automatically playing level tapes\n");
-    PrintLine("-", 79);
-    Print("Level series identifier: '%s'\n", autoplay_leveldir->identifier);
-    Print("Level series name:       '%s'\n", autoplay_leveldir->name);
-    Print("Level series author:     '%s'\n", autoplay_leveldir->author);
-    Print("Number of levels:        %d\n",   autoplay_leveldir->levels);
-    PrintLine("=", 79);
-    Print("\n");
+    {
+      // auto-play selected level set
+      autoplay.leveldir = getTreeInfoFromIdentifier(leveldir_first,
+						    global.autoplay_leveldir);
+    }
 
-    for (i = 0; i < MAX_TAPES_PER_SET; i++)
-      level_failed[i] = FALSE;
+    if (autoplay.leveldir == NULL)
+      Fail("no such level identifier: '%s'", global.autoplay_leveldir);
 
     // only private tapes may be modified
     if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
       options.mytapes = TRUE;
 
-    autoplay_initialized = TRUE;
+    // set timestamp for batch tape upload
+    global.autoplay_time = time(NULL);
+
+    num_tapes = 0;
+
+    init_level_set = TRUE;
   }
 
   while (1)
   {
+    if (init_level_set)
+    {
+      leveldir_current = autoplay.leveldir;
+
+      if (autoplay.leveldir->first_level < 0)
+	autoplay.leveldir->first_level = 0;
+      if (autoplay.leveldir->last_level >= MAX_TAPES_PER_SET)
+	autoplay.leveldir->last_level = MAX_TAPES_PER_SET - 1;
+
+      autoplay.level_nr = autoplay.leveldir->first_level;
+
+      autoplay.num_levels_played = 0;
+      autoplay.num_levels_solved = 0;
+      autoplay.num_tapes_patched = 0;
+      autoplay.num_tape_missing = 0;
+
+      for (i = 0; i < MAX_TAPES_PER_SET; i++)
+	autoplay.level_failed[i] = FALSE;
+
+      PrintTapeReplayHeader(&autoplay);
+
+      init_level_set = FALSE;
+    }
+
+    if (autoplay.all_levelsets && global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+    {
+      boolean skip_levelset = FALSE;
+
+      if (!directoryExists(getTapeDir(autoplay.leveldir->subdir)))
+      {
+	Print("No tape directory for this level set found -- skipping.\n");
+
+	skip_levelset = TRUE;
+      }
+
+      if (CheckTapeDirectoryUploadsComplete(autoplay.leveldir->subdir))
+      {
+	Print("All tapes for this level set already uploaded -- skipping.\n");
+
+	skip_levelset = TRUE;
+      }
+
+      if (skip_levelset)
+      {
+	PrintTapeReplaySummary(&autoplay);
+
+	// continue with next level set
+	autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir);
+
+	// all level sets processed
+	if (autoplay.leveldir == NULL)
+	  break;
+
+	init_level_set = TRUE;
+
+	continue;
+      }
+    }
+
     if (global.autoplay_mode != AUTOPLAY_MODE_FIX || patch_nr == 0)
-      level_nr = autoplay_level_nr++;
+      level_nr = autoplay.level_nr++;
 
-    if (level_nr > autoplay_leveldir->last_level)
-      break;
+    UPDATE_BUSY_STATE();
+
+    // check if all tapes for this level set have been processed
+    if (level_nr > autoplay.leveldir->last_level)
+    {
+      PrintTapeReplaySummary(&autoplay);
+
+      if (!autoplay.all_levelsets)
+	break;
+
+      if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+	MarkTapeDirectoryUploadsAsComplete(autoplay.leveldir->subdir);
+
+      // continue with next level set
+      autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir);
+
+      // all level sets processed
+      if (autoplay.leveldir == NULL)
+	break;
+
+      init_level_set = TRUE;
+
+      continue;
+    }
 
     // set patch info (required for progress output)
     strcpy(tape_patch_info, "");
@@ -1498,7 +1933,18 @@ void AutoPlayTapes(void)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
+    // speed things up in case of missing private tapes (skip loading level)
+    if (options.mytapes && !fileExists(getTapeFilename(level_nr)))
+    {
+      autoplay.num_tape_missing++;
+
+      Print("Tape %03d: (no tape found)\n", level_nr);
+
+      continue;
+    }
+
     TapeErase();
+    TapeRewind();	// needed to reset "tape.auto_play_level_solved"
 
     LoadLevel(level_nr);
 
@@ -1515,8 +1961,8 @@ void AutoPlayTapes(void)
     continue;
 #endif
 
-    if (tape_filename)
-      LoadTapeFromFilename(tape_filename);
+    if (autoplay.tape_filename)
+      LoadTapeFromFilename(autoplay.tape_filename);
     else if (options.mytapes)
       LoadTape(level_nr);
     else
@@ -1524,7 +1970,7 @@ void AutoPlayTapes(void)
 
     if (tape.no_valid_file)
     {
-      num_tape_missing++;
+      autoplay.num_tape_missing++;
 
       Print("Tape %03d: (no tape found)\n", level_nr);
 
@@ -1588,58 +2034,49 @@ void AutoPlayTapes(void)
       }
     }
 
+    num_tapes++;
+
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
-      // set unique basename for score tape (for uploading to score server)
-      strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name));
+      boolean use_temporary_tape_file = FALSE;
 
-      // store score in first score entry
-      scores.last_added = 0;
-
-      struct ScoreEntry *entry = &scores.entry[scores.last_added];
+      Print("Tape %03d:\n", level_nr);
 
-      strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
-      strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
+      AutoPlayTapes_SetScoreEntry(0, 0);
 
-      entry->score = 0;
-      entry->time = 0;
+      if (autoplay.tape_filename == NULL)
+      {
+	autoplay.tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
+				  getDefaultSolutionTapeFilename(level_nr));
 
-      Print("Tape %03d:\n", level_nr);
-      PrintNoLog("- uploading score tape to score server ... ");
+	if (!fileExists(autoplay.tape_filename))
+	{
+	  // non-standard or incorrect solution tape -- save to temporary file
+	  autoplay.tape_filename = getTemporaryTapeFilename();
 
-      server_scores.uploaded = FALSE;
+	  SaveTapeToFilename(autoplay.tape_filename);
 
-      if (tape_filename == NULL)
-	tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
-			 getSolutionTapeFilename(level_nr));
+	  use_temporary_tape_file = TRUE;
+	}
+      }
 
-      SaveServerScoreFromFile(level_nr, tape_filename);
+      SaveServerScoreFromFile(level_nr, TRUE, autoplay.tape_filename);
 
-      // required for uploading multiple tapes
-      tape_filename = NULL;
+      boolean success = AutoPlayTapes_WaitForUpload();
 
-      unsigned int upload_delay = 0;
-      unsigned int upload_delay_value = 10000;
+      if (use_temporary_tape_file)
+        unlink(autoplay.tape_filename);
 
-      ResetDelayCounter(&upload_delay);
+      // required for uploading multiple tapes
+      autoplay.tape_filename = NULL;
 
-      // wait for score tape to be successfully uploaded (and fail on timeout)
-      while (!server_scores.uploaded)
+      if (!success)
       {
-	if (DelayReached(&upload_delay, upload_delay_value))
-	{
-	  PrintNoLog("\r");
-	  Print("- uploading score tape to score server - TIMEOUT.\n");
-
-	  Fail("cannot upload score tape to score server");
-	}
+	num_tapes = -num_tapes;
 
-	Delay(20);
+	break;
       }
 
-      PrintNoLog("\r");
-      Print("- uploading score tape to score server - uploaded.\n");
-
       continue;
     }
 
@@ -1651,57 +2088,46 @@ void AutoPlayTapes(void)
     TapeStartGamePlaying();
     TapeStartWarpForward(global.autoplay_mode);
 
-    autoplay_last_level_nr = level_nr;
+    autoplay.last_level_nr = level_nr;
 
-    return;
+    return num_tapes;
   }
 
-  char *autoplay_status = (num_levels_played == num_levels_solved &&
-			   num_levels_played > 0 ? " OK " : "WARN");
-  int autoplay_percent = (num_levels_played ?
-			  num_levels_solved * 100 / num_levels_played : 0);
+  if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+  {
+    Print("\n");
+    PrintLine("=", 79);
 
-  Print("\n");
-  PrintLine("=", 79);
-  Print("Number of levels played: %d\n", num_levels_played);
-  Print("Number of levels solved: %d (%d%%)\n", num_levels_solved,
-	(num_levels_played ? num_levels_solved * 100 / num_levels_played : 0));
-  if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
-    Print("Number of tapes fixed: %d\n", num_tapes_patched);
-  PrintLine("-", 79);
-  Print("Summary (for automatic parsing by scripts):\n");
+    if (num_tapes >= 0)
+      Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    else
+      Print("SUMMARY: Uploading tapes failed.\n");
 
-  if (tape_filename)
-  {
-    Print("TAPEFILE [%s] '%s', %d, %d, %d",
-	  autoplay_status,
-	  autoplay_leveldir->identifier,
-	  autoplay_last_level_nr,
-	  game.score_final,
-	  game.score_time_final);
+    PrintLine("=", 79);
   }
-  else
-  {
-    Print("LEVELDIR [%s] '%s', SOLVED %d/%d (%d%%)",
-	  autoplay_status,
-	  autoplay_leveldir->identifier,
-	  num_levels_solved,
-	  num_levels_played,
-	  autoplay_percent);
 
-    if (num_levels_played != num_levels_solved)
-    {
-      Print(", FAILED:");
-      for (i = 0; i < MAX_TAPES_PER_SET; i++)
-	if (level_failed[i])
-	  Print(" %03d", i);
-    }
-  }
+  // clear timestamp for batch tape upload (required after interactive upload)
+  global.autoplay_time = 0;
 
-  Print("\n");
-  PrintLine("=", 79);
+  // exit if running headless or if visually auto-playing tapes
+  if (program.headless || global.autoplay_mode != AUTOPLAY_MODE_UPLOAD)
+    CloseAllAndExit(0);
 
-  CloseAllAndExit(0);
+  // when running interactively, restore last selected level set and number
+  leveldir_current = leveldir_current_last;
+  level_nr = level_nr_last;
+
+  return num_tapes;
+}
+
+int AutoPlayTapes(void)
+{
+  return AutoPlayTapesExt(TRUE);
+}
+
+int AutoPlayTapesContinue(void)
+{
+  return AutoPlayTapesExt(FALSE);
 }
 
 
@@ -2105,7 +2531,7 @@ static void HandleTapeButtonsExt(int id)
       break;
 
     case TAPE_CTRL_ID_STOP:
-      TapeStop();
+      TapeStopTape();
 
       break;