added restoring level number when interactively uploading tapes to server

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index cf65474af537c6af772c7ab44f81eaac952222fb..f5d78c6a8cb14e5e2710780501538b73e35445af 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1464,7 +1464,9 @@ static int 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)
@@ -1694,6 +1696,19 @@ static int AutoPlayTapesExt(boolean initialize)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
+    if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+    {
+      // speed things up when uploading all existing private tapes
+      if (autoplay.all_levelsets && !fileExists(getTapeFilename(level_nr)))
+      {
+       autoplay.num_tape_missing++;
+
+       Print("Tape %03d: (no tape found)\n", level_nr);
+
+       continue;
+      }
+    }
+
     TapeErase();
     TapeRewind();      // needed to reset "tape.auto_play_level_solved"
 
@@ -1837,12 +1852,24 @@ static int AutoPlayTapesExt(boolean initialize)
     return num_tapes;
   }
 
+  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;
 
   if (program.headless)
     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;
 }