X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=0fc6c782478d68746c997e2625359ab2f9900cfe;hb=abe3f622c1318a28b8234748eae9f9e5931e73f3;hp=62cb3e0d102785f5d5dec5c879c9ce55bddecd65;hpb=ec32314a7ce9f3ac478d7fdecf85ed949816bdc1;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 62cb3e0d..0fc6c782 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1427,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[] =
   {
@@ -1528,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);
@@ -1577,18 +1579,28 @@ static void AutoPlayTapesExt(boolean initialize)
     {
       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;
 
@@ -1614,6 +1626,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;
   }
 
@@ -1768,6 +1785,8 @@ static void AutoPlayTapesExt(boolean initialize)
       }
     }
 
+    num_tapes++;
+
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
       boolean use_temporary_tape_file = FALSE;
@@ -1781,9 +1800,22 @@ 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 =
+	  (!tape.no_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);
@@ -1815,21 +1847,26 @@ static void AutoPlayTapesExt(boolean initialize)
 
     autoplay.last_level_nr = level_nr;
 
-    return;
+    return num_tapes;
   }
 
+  // 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);
 }