X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=cf65474af537c6af772c7ab44f81eaac952222fb;hb=f2e98436acf26eff762250802ae4ee910ebdfe1a;hp=fc8f922b578cdda8001ce4acd65507a4aeeca8d6;hpb=9fcd46b92772e2b72aeaf036a6130fe35edc5f87;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index fc8f922b..cf65474a 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1587,11 +1587,20 @@ static int AutoPlayTapesExt(boolean initialize)
       if (tape.no_valid_file)
 	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;
 
@@ -1791,20 +1800,7 @@ static int AutoPlayTapesExt(boolean initialize)
 	autoplay.tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
 				  getDefaultSolutionTapeFilename(level_nr));
 
-	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)
+	if (!fileExists(autoplay.tape_filename))
 	{
 	  // non-standard or incorrect solution tape -- save to temporary file
 	  autoplay.tape_filename = getTemporaryTapeFilename();