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

diff --git a/src/tape.c b/src/tape.c
index d7770329..0fc6c782 100644
--- 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;
 
@@ -1794,7 +1801,8 @@ static int AutoPlayTapesExt(boolean initialize)
 				  getDefaultSolutionTapeFilename(level_nr));
 
 	boolean correct_info_chunk =
-	  (strEqual(leveldir_current->identifier, tape.level_identifier) &&
+	  (!tape.no_info_chunk &&
+	   strEqual(leveldir_current->identifier, tape.level_identifier) &&
 	   level_nr == tape.level_nr);
 
 	if (!correct_info_chunk)