changed order of tape controls
[rocksndiamonds.git] / src / tape.c
index 8613f9ba7fafb369854cd8b955c38ff1cd99e0ca..70e6272a60137df287a3ebc2975cadc02ca44b70 100644 (file)
@@ -17,7 +17,7 @@
 #include "tools.h"
 #include "files.h"
 #include "network.h"
-#include "cartoons.h"
+#include "anim.h"
 
 #define DEBUG_TAPE_WHEN_PLAYING                        FALSE
 
@@ -139,7 +139,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define PG_Y2(y)                       (DOOR_GFX_PAGEY2 + (y))
 
 #define VIDEO_INFO_OFF                 (VIDEO_STATE_DATE_OFF   |       \
-                                        VIDEO_STATE_TIME_OFF)
+                                        VIDEO_STATE_TIME_OFF   |       \
+                                        VIDEO_STATE_FRAME_OFF)
 #define VIDEO_STATE_OFF                        (VIDEO_STATE_PLAY_OFF   |       \
                                         VIDEO_STATE_REC_OFF    |       \
                                         VIDEO_STATE_PAUSE_OFF  |       \
@@ -156,7 +157,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
                                         VIDEO_PRESS_OFF)
 
 #define VIDEO_INFO_ON                  (VIDEO_STATE_DATE_ON    |       \
-                                        VIDEO_STATE_TIME_ON)
+                                        VIDEO_STATE_TIME_ON    |       \
+                                        VIDEO_STATE_FRAME_ON)
 #define VIDEO_STATE_ON                 (VIDEO_STATE_PLAY_ON    |       \
                                         VIDEO_STATE_REC_ON     |       \
                                         VIDEO_STATE_PAUSE_ON   |       \
@@ -177,7 +179,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_PRESS                    (VIDEO_PRESS_ON | VIDEO_PRESS_OFF)
 #define VIDEO_ALL                      (VIDEO_ALL_ON | VIDEO_ALL_OFF)
 
-#define NUM_TAPE_FUNCTIONS             10
+#define NUM_TAPE_FUNCTIONS             11
 #define NUM_TAPE_FUNCTION_PARTS                2
 #define NUM_TAPE_FUNCTION_STATES       2
 
@@ -193,49 +195,54 @@ 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] =
   {
     {
-      { IMG_TAPE_LABEL_GFX_PLAY,               &tape.label.play        },
-      { IMG_TAPE_SYMBOL_GFX_PLAY,              &tape.symbol.play       },
+      { IMG_GFX_TAPE_LABEL_PLAY,               &tape.label.play        },
+      { IMG_GFX_TAPE_SYMBOL_PLAY,              &tape.symbol.play       },
     },
     {
-      { IMG_TAPE_LABEL_GFX_RECORD,             &tape.label.record      },
-      { IMG_TAPE_SYMBOL_GFX_RECORD,            &tape.symbol.record     },
+      { IMG_GFX_TAPE_LABEL_RECORD,             &tape.label.record      },
+      { IMG_GFX_TAPE_SYMBOL_RECORD,            &tape.symbol.record     },
     },
     {
-      { IMG_TAPE_LABEL_GFX_PAUSE,              &tape.label.pause       },
-      { IMG_TAPE_SYMBOL_GFX_PAUSE,             &tape.symbol.pause      },
+      { IMG_GFX_TAPE_LABEL_PAUSE,              &tape.label.pause       },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE,             &tape.symbol.pause      },
     },
     {
-      { IMG_TAPE_LABEL_GFX_DATE,               &tape.label.date        },
+      { IMG_GFX_TAPE_LABEL_DATE,               &tape.label.date        },
       { -1,                                    NULL                    },
     },
     {
-      { IMG_TAPE_LABEL_GFX_TIME,               &tape.label.time        },
+      { IMG_GFX_TAPE_LABEL_TIME,               &tape.label.time        },
       { -1,                                    NULL                    },
     },
     {
-      { IMG_TAPE_LABEL_GFX_FAST_FORWARD,       &tape.label.fast_forward  },
-      { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD,      &tape.symbol.fast_forward },
+      /* (no label for displaying optional frame) */
+      { -1,                                    NULL                    },
+      { -1,                                    NULL                    },
+    },
+    {
+      { IMG_GFX_TAPE_LABEL_FAST_FORWARD,       &tape.label.fast_forward  },
+      { IMG_GFX_TAPE_SYMBOL_FAST_FORWARD,      &tape.symbol.fast_forward },
     },
     {
-      { IMG_TAPE_LABEL_GFX_PAUSE_BEFORE_END,   &tape.label.pause_before_end  },
-      { IMG_TAPE_SYMBOL_GFX_PAUSE_BEFORE_END,  &tape.symbol.pause_before_end },
+      { IMG_GFX_TAPE_LABEL_WARP_FORWARD,       &tape.label.warp_forward  },
+      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD,      &tape.symbol.warp_forward },
     },
     {
-      { IMG_TAPE_LABEL_GFX_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind},
-      { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind},
+      { IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind},
+      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind},
     },
     {
-      { IMG_TAPE_LABEL_GFX_WARP_FORWARD,       &tape.label.warp_forward  },
-      { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD,      &tape.symbol.warp_forward },
+      { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END,   &tape.label.pause_before_end  },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END,  &tape.symbol.pause_before_end },
     },
     {
-      { IMG_TAPE_LABEL_GFX_SINGLE_STEP,                &tape.label.single_step  },
-      { IMG_TAPE_SYMBOL_GFX_SINGLE_STEP,       &tape.symbol.single_step },
+      { IMG_GFX_TAPE_LABEL_SINGLE_STEP,                &tape.label.single_step  },
+      { IMG_GFX_TAPE_SYMBOL_SINGLE_STEP,       &tape.symbol.single_step },
     },
   };
 
@@ -245,16 +252,18 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
     {
       for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++)    /* label or symbol */
       {
-       if (video_pos[i][j].graphic == -1 ||
-           video_pos[i][j].pos->x < 0 ||
-           video_pos[i][j].pos->y < 0)
+       int graphic = video_pos[i][j].graphic;
+       struct XY *pos = video_pos[i][j].pos;
+
+       if (graphic == -1 ||
+           pos->x == -1 ||
+           pos->y == -1)
          continue;
 
        if (state & (1 << (i * 2 + k)))
        {
          struct GraphicInfo *gfx_bg = &graphic_info[IMG_BACKGROUND_TAPE];
-         struct GraphicInfo *gfx = &graphic_info[video_pos[i][j].graphic];
-         struct Rect *pos = video_pos[i][j].pos;
+         struct GraphicInfo *gfx = &graphic_info[graphic];
          Bitmap *gd_bitmap;
          int gd_x, gd_y;
          int skip_value =
@@ -280,6 +289,8 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
          if (gd_bitmap != NULL)
            BlitBitmap(gd_bitmap, drawto, gd_x, gd_y, gfx->width, gfx->height,
                       VX + pos->x, VY + pos->y);
+
+         redraw_mask |= REDRAW_DOOR_2;
        }
       }
     }
@@ -300,8 +311,10 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
 #define DATETIME_TIME_MM               (1 << 7)
 #define DATETIME_TIME_SS               (1 << 8)
 
-#define DATETIME_XOFFSET_1             (1 << 9)
-#define DATETIME_XOFFSET_2             (1 << 10)
+#define DATETIME_FRAME                 (1 << 9)
+
+#define DATETIME_XOFFSET_1             (1 << 10)
+#define DATETIME_XOFFSET_2             (1 << 11)
 
 #define DATETIME_DATE                  (DATETIME_DATE_YYYY     |       \
                                         DATETIME_DATE_YY       |       \
@@ -358,6 +371,8 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
     { &tape.text.time_mm,      DATETIME_TIME_MM                        },
     { &tape.text.time_ss,      DATETIME_TIME_SS                        },
 
+    { &tape.text.frame,                DATETIME_FRAME                          },
+
     { NULL,                    DATETIME_NONE                           },
   };
 
@@ -407,6 +422,10 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
 
       DrawText(xpos, ypos, s, pos->font);
     }
+    else if ((type & DATETIME_FRAME) && (state & VIDEO_STATE_FRAME_ON))
+    {
+      DrawText(xpos, ypos, int2str(value, pos->size), pos->font);
+    }
   }
 }
 
@@ -414,8 +433,16 @@ void DrawVideoDisplay(unsigned int state, unsigned int value)
 {
   DrawVideoDisplay_Graphics(state, value);
   DrawVideoDisplay_DateTime(state, value);
+}
 
-  redraw_mask |= REDRAW_DOOR_2;
+void DrawVideoDisplayLabel(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_LABEL_ONLY);
+}
+
+void DrawVideoDisplaySymbol(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
 }
 
 void DrawCompleteVideoDisplay()
@@ -437,6 +464,7 @@ void DrawCompleteVideoDisplay()
     DrawVideoDisplay(VIDEO_STATE_REC_ON, 0);
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
+    DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames);
 
     if (tape.pausing)
       DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0);
@@ -446,6 +474,7 @@ void DrawCompleteVideoDisplay()
     DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0);
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
+    DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0);
 
     if (tape.pausing)
       DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0);
@@ -454,6 +483,7 @@ void DrawCompleteVideoDisplay()
   {
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
+    DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames);
   }
 
   BlitBitmap(drawto, bitmap_db_door_2, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
@@ -473,7 +503,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 
   if (redraw_display)
   {
-    RedrawPlayfield(TRUE, 0,0,0,0);
+    RedrawPlayfield();
     DrawGameDoorValues();
   }
 }
@@ -501,6 +531,7 @@ void TapeErase()
 
   tape.counter = 0;
   tape.length = 0;
+  tape.length_frames = 0;
   tape.length_seconds = 0;
 
   if (leveldir_current)
@@ -529,7 +560,7 @@ static void TapeRewind()
 {
   tape.counter = 0;
   tape.delay_played = 0;
-  tape.pause_before_death = FALSE;
+  tape.pause_before_end = FALSE;
   tape.recording = FALSE;
   tape.playing = FALSE;
   tape.fast_forward = FALSE;
@@ -565,6 +596,7 @@ void TapeStartRecording(int random_seed)
   DrawVideoDisplay(VIDEO_STATE_REC_ON, 0);
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
+  DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0);
 
   MapTapeWarpButton();
 
@@ -593,11 +625,21 @@ static void TapeAppendRecording()
   if (!tape.playing || !tape.pausing)
     return;
 
-  tape.pos[tape.counter].delay = tape.delay_played;
+  // stop playing
   tape.playing = FALSE;
+  tape.fast_forward = FALSE;
+  tape.warp_forward = FALSE;
+  tape.pause_before_end = FALSE;
+  tape.deactivate_display = FALSE;
+
+  // start recording
   tape.recording = TRUE;
   tape.changed = TRUE;
 
+  // set current delay (for last played move)
+  tape.pos[tape.counter].delay = tape.delay_played;
+
+  // set current date
   TapeSetDateFromNow();
 
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
@@ -615,7 +657,8 @@ void TapeHaltRecording()
   tape.pos[tape.counter].delay = 0;
 
   tape.length = tape.counter;
-  tape.length_seconds = GetTapeLength();
+  tape.length_frames = GetTapeLengthFrames();
+  tape.length_seconds = GetTapeLengthSeconds();
 }
 
 void TapeStopRecording()
@@ -686,40 +729,66 @@ void TapeTogglePause(boolean toggle_manual)
 {
   int state = 0;
 
-  if (tape.pause_before_death)
-    state |= VIDEO_STATE_PBEND_OFF;
-  else if (tape.fast_forward)
-    state |= VIDEO_STATE_FFWD_OFF;
-
   tape.pausing = !tape.pausing;
-  tape.fast_forward = FALSE;
-  tape.pause_before_death = FALSE;
 
   if (tape.single_step && toggle_manual)
     tape.single_step = FALSE;
 
-  state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
+  state |= VIDEO_STATE_PAUSE(tape.pausing);
+
+  if (tape.pause_before_end)
+    state |= VIDEO_STATE_PBEND(!tape.pausing);
+  else if (tape.fast_forward)
+    state |= VIDEO_STATE_FFWD(!tape.pausing);
+
   if (tape.playing)
     state |= VIDEO_STATE_PLAY_ON;
   else
-    state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF);
+    state |= VIDEO_STATE_1STEP(tape.single_step);
 
   DrawVideoDisplay(state, 0);
 
   if (tape.warp_forward)
   {
-    TapeStopWarpForward();
+    if (tape.pausing)
+    {
+      TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+    }
+    else if (tape.deactivate_display)
+    {
+      TapeDeactivateDisplayOn();
+
+      DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
+    }
+    else
+    {
+      DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
+    }
 
     if (tape.quick_resume)
     {
       tape.quick_resume = FALSE;
 
+      TapeStopWarpForward();
       TapeAppendRecording();
 
-      if (!CheckEngineSnapshot())
-       SaveEngineSnapshot();
+      if (!CheckEngineSnapshotSingle())
+       SaveEngineSnapshotSingle();
+
+      // restart step/move snapshots after quick loading tape
+      SaveEngineSnapshotToListInitial();
     }
   }
+
+  if (setup.show_snapshot_buttons &&
+      game_status == GAME_MODE_PLAYING &&
+      CheckEngineSnapshotList())
+  {
+    if (tape.pausing)
+      MapUndoRedoButtons();
+    else if (!tape.single_step)
+      UnmapUndoRedoButtons();
+  }
 }
 
 void TapeStartPlaying()
@@ -737,6 +806,7 @@ void TapeStartPlaying()
   DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0);
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
+  DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0);
 
   MapTapeWarpButton();
 
@@ -765,65 +835,39 @@ void TapeStopPlaying()
 
 byte *TapePlayAction()
 {
+  int update_delay = FRAMES_PER_SECOND / 2;
+  boolean update_video_display = (FrameCounter % update_delay == 0);
+  boolean update_draw_label_on = ((FrameCounter / update_delay) % 2 == 1);
   static byte action[MAX_PLAYERS];
   int i;
 
   if (!tape.playing || tape.pausing)
     return NULL;
 
-  if (tape.pause_before_death) /* stop 10 seconds before player gets killed */
+  if (tape.pause_before_end)  // stop some seconds before end of tape
   {
-    if (!(FrameCounter % 20))
-    {
-      if ((FrameCounter / 20) % 2)
-       DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
-      else
-       DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
-    }
-
-    if (tape.warp_forward)
-    {
-      if (tape.deactivate_display)
-       DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-      else
-       DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-    }
-
     if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
+      tape.fast_forward = FALSE;
+      tape.pause_before_end = FALSE;
+
+      TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
 
       return NULL;
     }
   }
-  else if (tape.fast_forward)
-  {
-    if ((FrameCounter / 20) % 2)
-      DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY);
-    else
-      DrawVideoDisplay(VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY);
-
-    if (tape.warp_forward)
-    {
-      if (tape.deactivate_display)
-       DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-      else
-       DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-    }
-  }
 
-#if 0
-  /* !!! this makes things much slower !!! */
-  else if (tape.warp_forward)
+  if (update_video_display && !tape.deactivate_display)
   {
-    if ((FrameCounter / 20) % 2)
-      DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_LABEL_ONLY);
-    else
-      DrawVideoDisplay(VIDEO_STATE_WARP_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+    if (tape.pause_before_end)
+      DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
+    else if (tape.fast_forward)
+      DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
 
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+    if (tape.warp_forward)
+      DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
   }
-#endif
 
   if (tape.counter >= tape.length)     /* end of tape reached */
   {
@@ -881,56 +925,66 @@ void TapeStop()
   {
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
+    DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames);
   }
 }
 
-unsigned int GetTapeLength()
+unsigned int GetTapeLengthFrames()
 {
-  unsigned int tape_length = 0;
+  unsigned int tape_length_frames = 0;
   int i;
 
   if (TAPE_IS_EMPTY(tape))
     return(0);
 
   for (i = 0; i < tape.length; i++)
-    tape_length += tape.pos[i].delay;
+    tape_length_frames += tape.pos[i].delay;
+
+  return tape_length_frames;
+}
 
-  return(tape_length * GAME_FRAME_DELAY / 1000);
+unsigned int GetTapeLengthSeconds()
+{
+  return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000);
 }
 
 static void TapeStartWarpForward()
 {
   tape.warp_forward = TRUE;
 
-  if (!tape.fast_forward && !tape.pause_before_death)
+  if (!tape.fast_forward && !tape.pause_before_end)
   {
     tape.pausing = FALSE;
+    tape.pause_before_end = TRUE;
     tape.deactivate_display = TRUE;
 
     TapeDeactivateDisplayOn();
-  }
 
-  if (tape.fast_forward || tape.pause_before_death)
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+    DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
+    DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
+  }
   else
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, 0);
+  {
+    DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
+  }
 }
 
 static void TapeStopWarpForward()
 {
-  int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
+  int state = VIDEO_STATE_PAUSE(tape.pausing);
+
+  if (tape.deactivate_display)
+    tape.pause_before_end = FALSE;
 
   tape.warp_forward = FALSE;
   tape.deactivate_display = FALSE;
 
   TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
 
-  if (tape.pause_before_death)
-    state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON;
-  else if (tape.fast_forward)
-    state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_FFWD_ON;
-  else
-    state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PLAY_ON;
+  state |= VIDEO_STATE_WARP_OFF;
+  state |= (tape.pause_before_end ? VIDEO_STATE_PBEND_ON :
+           tape.fast_forward     ? VIDEO_STATE_FFWD_ON :
+           VIDEO_STATE_PLAY_ON);
 
   DrawVideoDisplay(state, 0);
 }
@@ -945,8 +999,7 @@ static void TapeSingleStep()
 
   tape.single_step = !tape.single_step;
 
-  DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON :
-                   VIDEO_STATE_1STEP_OFF), 0);
+  DrawVideoDisplay(VIDEO_STATE_1STEP(tape.single_step), 0);
 }
 
 void TapeQuickSave()
@@ -972,7 +1025,7 @@ void TapeQuickSave()
   }
 
   if (SaveTapeChecked(tape.level_nr))
-    SaveEngineSnapshot();
+    SaveEngineSnapshotSingle();
 }
 
 void TapeQuickLoad()
@@ -997,11 +1050,11 @@ void TapeQuickLoad()
   if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
     return;
 
-  if (CheckEngineSnapshot())
+  if (CheckEngineSnapshotSingle())
   {
     TapeStartGamePlaying();
 
-    LoadEngineSnapshot();
+    LoadEngineSnapshotSingle();
 
     DrawCompleteVideoDisplay();
 
@@ -1011,6 +1064,9 @@ void TapeQuickLoad()
     TapeStopWarpForward();
     TapeAppendRecording();
 
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
+
     if (FrameCounter > 0)
       return;
   }
@@ -1079,7 +1135,9 @@ void AutoPlayTape()
   else
   {
     DrawCompleteVideoDisplay();
+
     audio.sound_enabled = FALSE;
+    setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
 
     autoplay_leveldir = getTreeInfoFromIdentifier(leveldir_first,
                                                  global.autoplay_leveldir);
@@ -1151,7 +1209,12 @@ void AutoPlayTape()
     printf("playing tape ... ");
 
     TapeStartGamePlaying();
-    TapeStartWarpForward();
+
+    if (global.autoplay_mode == AUTOPLAY_FFWD)
+      tape.fast_forward = TRUE;
+
+    if (global.autoplay_mode != AUTOPLAY_PLAY)
+      TapeStartWarpForward();
 
     return;
   }
@@ -1187,34 +1250,34 @@ void AutoPlayTape()
 static struct
 {
   int graphic;
-  struct Rect *pos;
+  struct XY *pos;
   int gadget_id;
   char *infotext;
 } tapebutton_info[NUM_TAPE_BUTTONS] =
 {
   {
-    IMG_TAPE_BUTTON_GFX_EJECT,         &tape.button.eject,
+    IMG_GFX_TAPE_BUTTON_EJECT,         &tape.button.eject,
     TAPE_CTRL_ID_EJECT,                        "eject tape"
   },
   {
     /* (same position as "eject" button) */
-    IMG_TAPE_BUTTON_GFX_EXTRA,         &tape.button.eject,
+    IMG_GFX_TAPE_BUTTON_EXTRA,         &tape.button.eject,
     TAPE_CTRL_ID_EXTRA,                        "extra functions"
   },
   {
-    IMG_TAPE_BUTTON_GFX_STOP,          &tape.button.stop,
+    IMG_GFX_TAPE_BUTTON_STOP,          &tape.button.stop,
     TAPE_CTRL_ID_STOP,                 "stop tape"
   },
   {
-    IMG_TAPE_BUTTON_GFX_PAUSE,         &tape.button.pause,
+    IMG_GFX_TAPE_BUTTON_PAUSE,         &tape.button.pause,
     TAPE_CTRL_ID_PAUSE,                        "pause tape"
   },
   {
-    IMG_TAPE_BUTTON_GFX_RECORD,                &tape.button.record,
+    IMG_GFX_TAPE_BUTTON_RECORD,                &tape.button.record,
     TAPE_CTRL_ID_RECORD,               "record tape"
   },
   {
-    IMG_TAPE_BUTTON_GFX_PLAY,          &tape.button.play,
+    IMG_GFX_TAPE_BUTTON_PLAY,          &tape.button.play,
     TAPE_CTRL_ID_PLAY,                 "play tape"
   }
 };
@@ -1226,7 +1289,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;
@@ -1337,6 +1400,10 @@ static void HandleTapeButtonsExt(int id)
        {
          TapeStartWarpForward();
        }
+       else if (tape.pausing)                  /* PAUSE -> WARP FORWARD PLAY */
+       {
+         TapeTogglePause(TAPE_TOGGLE_MANUAL);
+       }
        else                                    /* WARP FORWARD PLAY -> PLAY */
        {
          TapeStopWarpForward();
@@ -1368,6 +1435,13 @@ static void HandleTapeButtonsExt(int id)
       break;
 
     case TAPE_CTRL_ID_PLAY:
+      if (tape.recording && tape.pausing)      /* PAUSE -> RECORD */
+      {
+       // ("TAPE_IS_EMPTY(tape)" is TRUE here -- probably fix this)
+
+       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+      }
+
       if (TAPE_IS_EMPTY(tape))
        break;
 
@@ -1379,17 +1453,33 @@ static void HandleTapeButtonsExt(int id)
       {
        if (tape.pausing)                       /* PAUSE -> PLAY */
        {
+         // continue playing in normal mode
+         tape.fast_forward = FALSE;
+         tape.warp_forward = FALSE;
+         tape.pause_before_end = FALSE;
+         tape.deactivate_display = FALSE;
+
          TapeTogglePause(TAPE_TOGGLE_MANUAL);
        }
+       else if (tape.warp_forward &&
+                !tape.fast_forward)            /* WARP FORWARD PLAY -> PLAY */
+       {
+         TapeStopWarpForward();
+       }
        else if (!tape.fast_forward)            /* PLAY -> FAST FORWARD PLAY */
        {
          tape.fast_forward = TRUE;
+
          DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
        }
-       else if (!tape.pause_before_death)      /* FFWD PLAY -> AUTO PAUSE */
+       else if (!tape.pause_before_end)        /* FFWD PLAY -> AUTO PAUSE */
        {
-         tape.pause_before_death = TRUE;
+         tape.pause_before_end = TRUE;
+
          DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
+
+         if (tape.warp_forward)
+           DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
        }
        else                                    /* AUTO PAUSE -> NORMAL PLAY */
        {
@@ -1397,7 +1487,7 @@ static void HandleTapeButtonsExt(int id)
            TapeStopWarpForward();
 
          tape.fast_forward = FALSE;
-         tape.pause_before_death = FALSE;
+         tape.pause_before_end = FALSE;
 
          DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
        }