code cleanup

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index a22fc9a54741013239ad7c63bf3a487c14237440..69356b0bfcf5b0e1a45eda034a16818197ef9a55 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1579,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;