removed writing tape file for upload if INFO chunk is missing or wrong

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index d77703295f3fcb5ee69619d658bd713de42e36b5..cf65474af537c6af772c7ab44f81eaac952222fb 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1579,21 +1579,28 @@ 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)
+      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;
 
@@ -1793,19 +1800,7 @@ static int AutoPlayTapesExt(boolean initialize)
        autoplay.tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
                                  getDefaultSolutionTapeFilename(level_nr));
 
-       boolean correct_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)
+       if (!fileExists(autoplay.tape_filename))
        {
          // non-standard or incorrect solution tape -- save to temporary file
          autoplay.tape_filename = getTemporaryTapeFilename();