changed using command line player name only for tape tests/uploads

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index e7a87852f7fa15411d40631513cfeb60f99c4666..fc8f922b578cdda8001ce4acd65507a4aeeca8d6 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1529,6 +1529,7 @@ static int 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);
@@ -1578,15 +1579,16 @@ static int 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)
+       Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename);
 
       global.autoplay_leveldir = tape.level_identifier;
 
@@ -1789,9 +1791,22 @@ static int 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)
+       {
+         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 solution tape -- save to temporary file
+         // non-standard or incorrect solution tape -- save to temporary file
          autoplay.tape_filename = getTemporaryTapeFilename();
 
          SaveTapeToFilename(autoplay.tape_filename);