fixed endless loop if stopping tape while auto-playing

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index 62cb3e0d102785f5d5dec5c879c9ce55bddecd65..68eeaccf0cd1267159d239005ce76870d7b1e6a6 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1427,9 +1427,10 @@ static void AutoPlayTapes_WaitForUpload(void)
   Print("- uploading score tape to score server - uploaded.\n");
 }
 
-static void AutoPlayTapesExt(boolean initialize)
+static int AutoPlayTapesExt(boolean initialize)
 {
   static struct AutoPlayInfo autoplay;
+  static int num_tapes = 0;
   static int patch_nr = 0;
   static char *patch_name[] =
   {
@@ -1463,7 +1464,9 @@ static void AutoPlayTapesExt(boolean initialize)
 
     -1
   };
+  LevelDirTree *leveldir_current_last = leveldir_current;
   boolean init_level_set = FALSE;
+  int level_nr_last = level_nr;
   int i;
 
   if (!initialize)
@@ -1528,6 +1531,7 @@ static void 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);
@@ -1577,18 +1581,28 @@ static void 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 && !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;
 
@@ -1614,6 +1628,11 @@ static void AutoPlayTapesExt(boolean initialize)
     if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
       options.mytapes = TRUE;
 
+    // set timestamp for batch tape upload
+    global.autoplay_time = time(NULL);
+
+    num_tapes = 0;
+
     init_level_set = TRUE;
   }
 
@@ -1677,6 +1696,20 @@ static void AutoPlayTapesExt(boolean initialize)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
+    char *tape_filename = (autoplay.tape_filename ? autoplay.tape_filename :
+                           options.mytapes ? getTapeFilename(level_nr) :
+                           getSolutionTapeFilename(level_nr));
+
+    // speed things up in case of missing tapes (by skipping loading level)
+    if (!fileExists(tape_filename))
+    {
+      autoplay.num_tape_missing++;
+
+      Print("Tape %03d: (no tape found)\n", level_nr);
+
+      continue;
+    }
+
     TapeErase();
     TapeRewind();      // needed to reset "tape.auto_play_level_solved"
 
@@ -1706,7 +1739,7 @@ static void AutoPlayTapesExt(boolean initialize)
     {
       autoplay.num_tape_missing++;
 
-      Print("Tape %03d: (no tape found)\n", level_nr);
+      Print("Tape %03d: (invalid tape)\n", level_nr);
 
       continue;
     }
@@ -1768,6 +1801,8 @@ static void AutoPlayTapesExt(boolean initialize)
       }
     }
 
+    num_tapes++;
+
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
       boolean use_temporary_tape_file = FALSE;
@@ -1783,7 +1818,7 @@ static void AutoPlayTapesExt(boolean initialize)
 
        if (!fileExists(autoplay.tape_filename))
        {
-         // 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);
@@ -1815,21 +1850,39 @@ static void AutoPlayTapesExt(boolean initialize)
 
     autoplay.last_level_nr = level_nr;
 
-    return;
+    return num_tapes;
   }
 
-  if (program.headless)
+  if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+  {
+    Print("\n");
+    PrintLine("=", 79);
+    Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    PrintLine("=", 79);
+  }
+
+  // clear timestamp for batch tape upload (required after interactive upload)
+  global.autoplay_time = 0;
+
+  // exit if running headless or if visually auto-playing tapes
+  if (program.headless || global.autoplay_mode != AUTOPLAY_MODE_UPLOAD)
     CloseAllAndExit(0);
+
+  // when running interactively, restore last selected level set and number
+  leveldir_current = leveldir_current_last;
+  level_nr = level_nr_last;
+
+  return num_tapes;
 }
 
-void AutoPlayTapes(void)
+int AutoPlayTapes(void)
 {
-  AutoPlayTapesExt(TRUE);
+  return AutoPlayTapesExt(TRUE);
 }
 
-void AutoPlayTapesContinue(void)
+int AutoPlayTapesContinue(void)
 {
-  AutoPlayTapesExt(FALSE);
+  return AutoPlayTapesExt(FALSE);
 }