X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=793bf0cec0145eb04ddaea56a01f898092558626;hb=91b5e8017245999d9f72b5cd8089597eb827666e;hp=51ac2f61c3d2c869c55863576e83d03cca1d29ad;hpb=b51083a87e5e21658e3a97e2e6d02f15622bf896;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 51ac2f61..793bf0ce 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -474,7 +474,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 struct AutoPlayInfo
 {
   LevelDirTree *leveldir;
-  boolean initialized;
+  boolean all_levelsets;
   int last_level_nr;
   int level_nr;
   int num_levels_played;
@@ -487,6 +487,28 @@ struct AutoPlayInfo
 
 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;
@@ -527,6 +549,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)
@@ -1285,6 +1359,26 @@ void FixTape_ForceSinglePlayer(void)
 // tape autoplay functions
 // ----------------------------------------------------------------------------
 
+static TreeInfo *getNextValidAutoPlayEntry(TreeInfo *node)
+{
+  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)
 {
   // set unique basename for score tape (for uploading to score server)
@@ -1306,7 +1400,7 @@ static void AutoPlayTapes_SetScoreEntry(int score, int time)
   server_scores.uploaded = FALSE;
 }
 
-static void AutoPlayTapes_WaitForUpload(void)
+static boolean AutoPlayTapes_WaitForUpload(void)
 {
   unsigned int upload_delay = 0;
   unsigned int upload_delay_value = 10000;
@@ -1321,19 +1415,27 @@ static void AutoPlayTapes_WaitForUpload(void)
       PrintNoLog("\r");
       Print("- uploading score tape to score server - TIMEOUT.\n");
 
-      Fail("cannot upload score tape to score server");
+      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;
 }
 
-void AutoPlayTapes(void)
+static int AutoPlayTapesExt(boolean initialize)
 {
   static struct AutoPlayInfo autoplay;
+  static int num_tapes = 0;
   static int patch_nr = 0;
   static char *patch_name[] =
   {
@@ -1367,9 +1469,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)
     {
@@ -1431,10 +1536,11 @@ void AutoPlayTapes(void)
 
       // 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);
+      SaveServerScore(level_nr, TRUE);
 
       AutoPlayTapes_WaitForUpload();
     }
@@ -1450,6 +1556,15 @@ void AutoPlayTapes(void)
   }
   else
   {
+    if (strEqual(global.autoplay_leveldir, "ALL"))
+    {
+      autoplay.all_levelsets = TRUE;
+
+      // 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 &&
@@ -1458,80 +1573,124 @@ void AutoPlayTapes(void)
       Fail("specify player name when uploading solution tapes");
     }
 
-    DrawCompleteVideoDisplay();
+    if (global.autoplay_mode != AUTOPLAY_MODE_UPLOAD)
+      DrawCompleteVideoDisplay();
 
-    audio.sound_enabled = FALSE;
-    setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
+    if (program.headless)
+    {
+      audio.sound_enabled = FALSE;
+      setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
+    }
 
     if (strSuffix(global.autoplay_leveldir, ".tape"))
     {
       autoplay.tape_filename = global.autoplay_leveldir;
 
+      if (!fileExists(autoplay.tape_filename))
+	Fail("tape file '%s' does not exist", autoplay.tape_filename);
+
       LoadTapeFromFilename(autoplay.tape_filename);
 
       if (tape.no_valid_file)
-      {
-	if (!fileExists(autoplay.tape_filename))
-	  Fail("tape file '%s' does not exist", autoplay.tape_filename);
-	else
-	  Fail("cannot load tape file '%s'", autoplay.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;
     }
 
-    autoplay.leveldir = getTreeInfoFromIdentifier(leveldir_first,
-						  global.autoplay_leveldir);
+    if (autoplay.all_levelsets)
+    {
+      // start auto-playing first level set
+      autoplay.leveldir = getFirstValidAutoPlayEntry(leveldir_first);
+    }
+    else
+    {
+      // auto-play selected level set
+      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");
-    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");
-
-    for (i = 0; i < MAX_TAPES_PER_SET; i++)
-      autoplay.level_failed[i] = FALSE;
-
     // 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 (global.autoplay_mode != AUTOPLAY_MODE_FIX || patch_nr == 0)
       level_nr = autoplay.level_nr++;
 
+    UPDATE_BUSY_STATE();
+
+    // check if all tapes for this level set have been processed
     if (level_nr > autoplay.leveldir->last_level)
-      break;
+    {
+      PrintTapeReplaySummary(&autoplay);
+
+      if (!autoplay.all_levelsets)
+	break;
+
+      // 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, "");
@@ -1542,7 +1701,22 @@ void AutoPlayTapes(void)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
+    char *tape_filename = (autoplay.tape_filename ? autoplay.tape_filename :
+                           options.mytapes ? getTapeFilename(level_nr) :
+                           getSolutionTapeFilename(level_nr));
+
+    // speed things up in case of missing tapes (by skipping loading level)
+    if (!fileExists(tape_filename))
+    {
+      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);
 
@@ -1570,7 +1744,7 @@ void AutoPlayTapes(void)
     {
       autoplay.num_tape_missing++;
 
-      Print("Tape %03d: (no tape found)\n", level_nr);
+      Print("Tape %03d: (invalid tape)\n", level_nr);
 
       continue;
     }
@@ -1632,6 +1806,8 @@ void AutoPlayTapes(void)
       }
     }
 
+    num_tapes++;
+
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
       boolean use_temporary_tape_file = FALSE;
@@ -1647,7 +1823,7 @@ void AutoPlayTapes(void)
 
 	if (!fileExists(autoplay.tape_filename))
 	{
-	  // non-standard solution tape -- save to temporary file
+	  // non-standard or incorrect solution tape -- save to temporary file
 	  autoplay.tape_filename = getTemporaryTapeFilename();
 
 	  SaveTapeToFilename(autoplay.tape_filename);
@@ -1656,9 +1832,9 @@ void AutoPlayTapes(void)
 	}
       }
 
-      SaveServerScoreFromFile(level_nr, autoplay.tape_filename);
+      SaveServerScoreFromFile(level_nr, TRUE, autoplay.tape_filename);
 
-      AutoPlayTapes_WaitForUpload();
+      boolean success = AutoPlayTapes_WaitForUpload();
 
       if (use_temporary_tape_file)
         unlink(autoplay.tape_filename);
@@ -1666,6 +1842,13 @@ void AutoPlayTapes(void)
       // required for uploading multiple tapes
       autoplay.tape_filename = NULL;
 
+      if (!success)
+      {
+	num_tapes = -1;
+
+	break;
+      }
+
       continue;
     }
 
@@ -1679,58 +1862,44 @@ void AutoPlayTapes(void)
 
     autoplay.last_level_nr = level_nr;
 
-    return;
+    return num_tapes;
   }
 
-  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);
+  if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+  {
+    Print("\n");
+    PrintLine("=", 79);
 
-  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 (num_tapes >= 0)
+      Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    else
+      Print("SUMMARY: Uploading tapes failed.\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);
+    PrintLine("=", 79);
   }
-  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);
-    }
-  }
+  // 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);
 }