X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftape.c;h=efc8bcb4c26eca3fdf8189470d00319dbdb0dc02;hb=0e5aef968a447e03002cbcc120df7555df624b85;hp=342f346df3703fabf00f668a17c19b528d67f162;hpb=9c92df9586b75ab4afc1345e944108e95e2f8174;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 342f346d..efc8bcb4 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -195,7 +195,7 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
   static struct
   {
     int graphic;
-    struct Rect *pos;
+    struct XY *pos;
   }
   video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] =
   {
@@ -253,7 +253,7 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
       for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++)	/* label or symbol */
       {
 	int graphic = video_pos[i][j].graphic;
-	struct Rect *pos = video_pos[i][j].pos;
+	struct XY *pos = video_pos[i][j].pos;
 
 	if (graphic == -1 ||
 	    pos->x == -1 ||
@@ -739,10 +739,21 @@ void TapeTogglePause(boolean toggle_manual)
 
       TapeAppendRecording();
 
-      if (!CheckEngineSnapshot())
-	SaveEngineSnapshot();
+      if (!CheckEngineSnapshotSingle())
+	SaveEngineSnapshotSingle();
+
+      // restart step/move snapshots after quick loading tape
+      SaveEngineSnapshotToListInitial();
     }
   }
+
+  if (CheckEngineSnapshotList())
+  {
+    if (tape.pausing)
+      MapUndoRedoButtons();
+    else if (!tape.single_step)
+      UnmapUndoRedoButtons();
+  }
 }
 
 void TapeStartPlaying()
@@ -1002,7 +1013,7 @@ void TapeQuickSave()
   }
 
   if (SaveTapeChecked(tape.level_nr))
-    SaveEngineSnapshot();
+    SaveEngineSnapshotSingle();
 }
 
 void TapeQuickLoad()
@@ -1027,11 +1038,11 @@ void TapeQuickLoad()
   if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
     return;
 
-  if (CheckEngineSnapshot())
+  if (CheckEngineSnapshotSingle())
   {
     TapeStartGamePlaying();
 
-    LoadEngineSnapshot();
+    LoadEngineSnapshotSingle();
 
     DrawCompleteVideoDisplay();
 
@@ -1041,6 +1052,9 @@ void TapeQuickLoad()
     TapeStopWarpForward();
     TapeAppendRecording();
 
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
+
     if (FrameCounter > 0)
       return;
   }
@@ -1217,7 +1231,7 @@ void AutoPlayTape()
 static struct
 {
   int graphic;
-  struct Rect *pos;
+  struct XY *pos;
   int gadget_id;
   char *infotext;
 } tapebutton_info[NUM_TAPE_BUTTONS] =
@@ -1256,7 +1270,7 @@ void CreateTapeButtons()
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
   {
     struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic];
-    struct Rect *pos = tapebutton_info[i].pos;
+    struct XY *pos = tapebutton_info[i].pos;
     struct GadgetInfo *gi;
     int gd_x = gfx->src_x;
     int gd_y = gfx->src_y;