X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=d77703295f3fcb5ee69619d658bd713de42e36b5;hb=5a4a6f4051fc89de7e47cf41d4d3e78dab4283d6;hp=c14b21694940eea6c63844c1bd0e2f25285d4623;hpb=71f6982088deb38bae6506216004fcbe4caf6f9a;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index c14b2169..d7770329 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -505,6 +505,8 @@ static void PrintTapeReplayHeader(struct AutoPlayInfo *autoplay)
   Print("Number of levels:        %d\n",   autoplay->leveldir->levels);
   PrintLine("=", 79);
   Print("\n");
+
+  DrawInitTextItem(autoplay->leveldir->name);
 }
 
 static void PrintTapeReplayProgress(boolean replay_finished)
@@ -1357,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)
@@ -1396,6 +1418,8 @@ static void AutoPlayTapes_WaitForUpload(void)
       Fail("cannot upload score tape to score server");
     }
 
+    UPDATE_BUSY_STATE();
+
     Delay(20);
   }
 
@@ -1403,9 +1427,10 @@ static void AutoPlayTapes_WaitForUpload(void)
   Print("- uploading score tape to score server - uploaded.\n");
 }
 
-static void AutoPlayTapesExt(boolean initialize)
+static int AutoPlayTapesExt(boolean initialize)
 {
   static struct AutoPlayInfo autoplay;
+  static int num_tapes = 0;
   static int patch_nr = 0;
   static char *patch_name[] =
   {
@@ -1504,6 +1529,7 @@ static void AutoPlayTapesExt(boolean initialize)
 
       // 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);
@@ -1540,10 +1566,14 @@ static void AutoPlayTapesExt(boolean initialize)
       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"))
     {
@@ -1559,6 +1589,9 @@ static void AutoPlayTapesExt(boolean initialize)
 	  Fail("cannot load tape file '%s'", autoplay.tape_filename);
       }
 
+      if (tape.no_info_chunk)
+	Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename);
+
       global.autoplay_leveldir = tape.level_identifier;
 
       if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET)
@@ -1570,7 +1603,7 @@ static void AutoPlayTapesExt(boolean initialize)
     if (autoplay.all_levelsets)
     {
       // start auto-playing first level set
-      autoplay.leveldir = getFirstValidTreeInfoEntry(leveldir_first);
+      autoplay.leveldir = getFirstValidAutoPlayEntry(leveldir_first);
     }
     else
     {
@@ -1586,6 +1619,11 @@ static void AutoPlayTapesExt(boolean initialize)
     if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
       options.mytapes = TRUE;
 
+    // set timestamp for batch tape upload
+    global.autoplay_time = time(NULL);
+
+    num_tapes = 0;
+
     init_level_set = TRUE;
   }
 
@@ -1618,6 +1656,8 @@ static void AutoPlayTapesExt(boolean initialize)
     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)
     {
@@ -1627,7 +1667,7 @@ static void AutoPlayTapesExt(boolean initialize)
 	break;
 
       // continue with next level set
-      autoplay.leveldir = getNextValidTreeInfoEntry(autoplay.leveldir);
+      autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir);
 
       // all level sets processed
       if (autoplay.leveldir == NULL)
@@ -1738,6 +1778,8 @@ static void AutoPlayTapesExt(boolean initialize)
       }
     }
 
+    num_tapes++;
+
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
       boolean use_temporary_tape_file = FALSE;
@@ -1751,9 +1793,21 @@ static void AutoPlayTapesExt(boolean initialize)
 	autoplay.tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
 				  getDefaultSolutionTapeFilename(level_nr));
 
-	if (!fileExists(autoplay.tape_filename))
+	boolean correct_info_chunk =
+	  (strEqual(leveldir_current->identifier, tape.level_identifier) &&
+	   level_nr == tape.level_nr);
+
+	if (!correct_info_chunk)
 	{
-	  // non-standard solution tape -- save to temporary file
+	  strncpy(tape.level_identifier, leveldir_current->identifier,
+		  MAX_FILENAME_LEN);
+	  tape.level_identifier[MAX_FILENAME_LEN] = '\0';
+	  tape.level_nr = level_nr;
+	}
+
+	if (!fileExists(autoplay.tape_filename) || !correct_info_chunk)
+	{
+	  // non-standard or incorrect solution tape -- save to temporary file
 	  autoplay.tape_filename = getTemporaryTapeFilename();
 
 	  SaveTapeToFilename(autoplay.tape_filename);
@@ -1785,20 +1839,26 @@ static void AutoPlayTapesExt(boolean initialize)
 
     autoplay.last_level_nr = level_nr;
 
-    return;
+    return num_tapes;
   }
 
-  CloseAllAndExit(0);
+  // clear timestamp for batch tape upload (required after interactive upload)
+  global.autoplay_time = 0;
+
+  if (program.headless)
+    CloseAllAndExit(0);
+
+  return num_tapes;
 }
 
-void AutoPlayTapes(void)
+int AutoPlayTapes(void)
 {
-  AutoPlayTapesExt(TRUE);
+  return AutoPlayTapesExt(TRUE);
 }
 
-void AutoPlayTapesContinue(void)
+int AutoPlayTapesContinue(void)
 {
-  AutoPlayTapesExt(FALSE);
+  return AutoPlayTapesExt(FALSE);
 }