X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=9f815143eddb3c67a6430f6f603d6db9a35e0ad6;hp=29886a5c7346da27c25a3b3b5b538d0f8e982a5d;hb=38212569c2f58866417f26e9c813ed8b23c5b2c4;hpb=97648ab29c587dee3e5fa5be3cc0cfda96543f22

diff --git a/src/tape.c b/src/tape.c
index 29886a5c..9f815143 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -35,13 +35,16 @@
 
 // values for tape handling
 #define TAPE_PAUSE_SECONDS_BEFORE_DEATH		5
+#define TAPE_MIN_SECONDS_FOR_UNDO_BUFFER	20
 
 // forward declaration for internal use
 static void HandleTapeButtons(struct GadgetInfo *);
 static void TapeStopWarpForward(void);
 static float GetTapeLengthSecondsFloat(void);
+static void CopyTapeToUndoBuffer(void);
 
 static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
+static struct TapeInfo tape_undo_buffer;
 
 
 // ============================================================================
@@ -528,6 +531,8 @@ void TapeErase(void)
 {
   int i;
 
+  CopyTapeToUndoBuffer();
+
   tape.counter = 0;
   tape.length = 0;
   tape.length_frames = 0;
@@ -889,10 +894,10 @@ byte *TapePlayAction(void)
     action[i] = tape.pos[tape.counter].action[i];
 
 #if DEBUG_TAPE_WHEN_PLAYING
-  printf("%05d", FrameCounter);
+  DebugContinued("", "%05d", FrameCounter);
   for (i = 0; i < MAX_TAPE_ACTIONS; i++)
-    printf("   %08x", action[i]);
-  printf("\n");
+    DebugContinued("", "   %08x", action[i]);
+  DebugContinued("tape:play", "\n");
 #endif
 
   tape.set_centered_player = FALSE;
@@ -1145,6 +1150,57 @@ boolean PlaySolutionTape(void)
   return TRUE;
 }
 
+static boolean checkTapesFromSameLevel(struct TapeInfo *t1, struct TapeInfo *t2)
+{
+  return (strEqual(t1->level_identifier, t2->level_identifier) &&
+	  t1->level_nr == t2->level_nr);
+}
+
+static void CopyTape(struct TapeInfo *tape_from, struct TapeInfo *tape_to)
+{
+  if (tape_to->level_identifier != NULL)
+    checked_free(tape_to->level_identifier);
+
+  *tape_to = *tape_from;
+
+  tape_to->level_identifier = getStringCopy(tape_from->level_identifier);
+}
+
+static void SwapTapes(struct TapeInfo *t1, struct TapeInfo *t2)
+{
+  struct TapeInfo tmp = *t1;
+
+  *t1 = *t2;
+  *t2 = tmp;
+}
+
+static void CopyTapeToUndoBuffer(void)
+{
+  // copy tapes to undo buffer if large enough (or larger than last undo tape)
+  // or if the last undo tape is from a different level set or level number
+  if (tape.length_seconds >= TAPE_MIN_SECONDS_FOR_UNDO_BUFFER ||
+      tape.length_seconds >= tape_undo_buffer.length_seconds ||
+      !checkTapesFromSameLevel(&tape, &tape_undo_buffer))
+  {
+    CopyTape(&tape, &tape_undo_buffer);
+  }
+}
+
+void UndoTape(void)
+{
+  // only undo tapes from same level set and with same level number
+  if (!checkTapesFromSameLevel(&tape, &tape_undo_buffer))
+    return;
+
+  if (!TAPE_IS_STOPPED(tape))
+    TapeStop();
+
+  // swap last recorded tape with undo buffer, so undo can be reversed
+  SwapTapes(&tape, &tape_undo_buffer);
+
+  DrawCompleteVideoDisplay();
+}
+
 void FixTape_ForceSinglePlayer(void)
 {
   int i;
@@ -1268,8 +1324,7 @@ void AutoPlayTapes(void)
 						  global.autoplay_leveldir);
 
     if (autoplay_leveldir == NULL)
-      Error(ERR_EXIT, "no such level identifier: '%s'",
-	    global.autoplay_leveldir);
+      Fail("no such level identifier: '%s'", global.autoplay_leveldir);
 
     leveldir_current = autoplay_leveldir;
 
@@ -1511,8 +1566,7 @@ void PatchTapes(void)
 						  global.patchtapes_leveldir);
 
   if (patchtapes_leveldir == NULL)
-    Error(ERR_EXIT, "no such level identifier: '%s'",
-	  global.patchtapes_leveldir);
+    Fail("no such level identifier: '%s'", global.patchtapes_leveldir);
 
   leveldir_current = patchtapes_leveldir;
 
@@ -1657,7 +1711,7 @@ void CreateTapeButtons(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     tape_gadget[id] = gi;
   }