added creating engine snapshots when using mouse click events
[rocksndiamonds.git] / src / tape.c
index 9a5aaa9191c08b4211b3bc147c766d4102368864..9f815143eddb3c67a6430f6f603d6db9a35e0ad6 100644 (file)
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* tape.c                                                   *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 https://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// tape.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
 #include "tools.h"
 #include "files.h"
 #include "network.h"
-#include "cartoons.h"
+#include "anim.h"
 
-/* tape button identifiers */
+#define DEBUG_TAPE_WHEN_PLAYING                        FALSE
+
+// tape button identifiers
 #define TAPE_CTRL_ID_EJECT                     0
 #define TAPE_CTRL_ID_EXTRA                     1
 #define TAPE_CTRL_ID_STOP                      2
 #define TAPE_CTRL_ID_PAUSE                     3
 #define TAPE_CTRL_ID_RECORD                    4
 #define TAPE_CTRL_ID_PLAY                      5
+#define TAPE_CTRL_ID_INSERT_SOLUTION           6
+#define TAPE_CTRL_ID_PLAY_SOLUTION             7
 
-#define NUM_TAPE_BUTTONS                       6
+#define NUM_TAPE_BUTTONS                       8
 
-/* values for tape handling */
+// values for tape handling
 #define TAPE_PAUSE_SECONDS_BEFORE_DEATH                5
+#define TAPE_MIN_SECONDS_FOR_UNDO_BUFFER       20
 
-/* forward declaration for internal use */
+// forward declaration for internal use
 static void HandleTapeButtons(struct GadgetInfo *);
-static void TapeStopWarpForward();
+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;
 
 
-/* ========================================================================= */
-/* video tape definitions                                                    */
-/* ========================================================================= */
-
-/* some positions in the video tape control window */
-#define VIDEO_DATE_LABEL_XPOS          (VIDEO_DISPLAY1_XPOS)
-#define VIDEO_DATE_LABEL_YPOS          (VIDEO_DISPLAY1_YPOS)
-#define VIDEO_DATE_LABEL_XSIZE         (VIDEO_DISPLAY_XSIZE)
-#define VIDEO_DATE_LABEL_YSIZE         (VIDEO_DISPLAY_YSIZE)
-#define VIDEO_DATE_XPOS                        (VIDEO_DISPLAY1_XPOS + 2)
-#define VIDEO_DATE_YPOS                        (VIDEO_DISPLAY1_YPOS + 14)
-#define VIDEO_DATE_XSIZE               (VIDEO_DISPLAY_XSIZE)
-#define VIDEO_DATE_YSIZE               16
-#define VIDEO_REC_LABEL_XPOS           (VIDEO_DISPLAY2_XPOS)
-#define VIDEO_REC_LABEL_YPOS           (VIDEO_DISPLAY2_YPOS)
-#define VIDEO_REC_LABEL_XSIZE          20
-#define VIDEO_REC_LABEL_YSIZE          12
-#define VIDEO_REC_SYMBOL_XPOS          (VIDEO_DISPLAY2_XPOS + 20)
-#define VIDEO_REC_SYMBOL_YPOS          (VIDEO_DISPLAY2_YPOS)
-#define VIDEO_REC_SYMBOL_XSIZE         16
-#define VIDEO_REC_SYMBOL_YSIZE         16
-#define VIDEO_PLAY_LABEL_XPOS          (VIDEO_DISPLAY2_XPOS + 65)
-#define VIDEO_PLAY_LABEL_YPOS          (VIDEO_DISPLAY2_YPOS)
-#define VIDEO_PLAY_LABEL_XSIZE         22
-#define VIDEO_PLAY_LABEL_YSIZE         12
-#define VIDEO_PLAY_SYMBOL_XPOS         (VIDEO_DISPLAY2_XPOS + 52)
-#define VIDEO_PLAY_SYMBOL_YPOS         (VIDEO_DISPLAY2_YPOS)
-#define VIDEO_PLAY_SYMBOL_XSIZE                11
-#define VIDEO_PLAY_SYMBOL_YSIZE                13
-#define VIDEO_PAUSE_LABEL_XPOS         (VIDEO_DISPLAY2_XPOS)
-#define VIDEO_PAUSE_LABEL_YPOS         (VIDEO_DISPLAY2_YPOS + 20)
-#define VIDEO_PAUSE_LABEL_XSIZE                35
-#define VIDEO_PAUSE_LABEL_YSIZE                8
-#define VIDEO_PAUSE_SYMBOL_XPOS                (VIDEO_DISPLAY2_XPOS + 35)
-#define VIDEO_PAUSE_SYMBOL_YPOS                (VIDEO_DISPLAY2_YPOS)
-#define VIDEO_PAUSE_SYMBOL_XSIZE       17
-#define VIDEO_PAUSE_SYMBOL_YSIZE       13
-#define VIDEO_TIME_XPOS                        (VIDEO_DISPLAY2_XPOS + 39)
-#define VIDEO_TIME_YPOS                        (VIDEO_DISPLAY2_YPOS + 14)
-#define VIDEO_TIME_XSIZE               50
-#define VIDEO_TIME_YSIZE               16
-
-/* some default values for tape labels and symbols */
-#define VIDEO_LABEL_XPOS               5
-#define VIDEO_LABEL_YPOS               42
-#define VIDEO_LABEL_XSIZE              40
-#define VIDEO_LABEL_YSIZE              28
-#define VIDEO_SYMBOL_XPOS              39
-#define VIDEO_SYMBOL_YPOS              42
-#define VIDEO_SYMBOL_XSIZE             56
-#define VIDEO_SYMBOL_YSIZE             13
-
-/* values for certain tape labels and symbols */
-#define VIDEO_FFWD_LABEL_XPOS          VIDEO_LABEL_XPOS
-#define VIDEO_FFWD_LABEL_YPOS          193
-#define VIDEO_FFWD_LABEL_XSIZE         VIDEO_LABEL_XSIZE
-#define VIDEO_FFWD_LABEL_YSIZE         VIDEO_LABEL_YSIZE
-#define VIDEO_FFWD_SYMBOL_XPOS         VIDEO_SYMBOL_XPOS
-#define VIDEO_FFWD_SYMBOL_YPOS         193
-#define VIDEO_FFWD_SYMBOL_XSIZE                27
-#define VIDEO_FFWD_SYMBOL_YSIZE                VIDEO_SYMBOL_YSIZE
-
-#define VIDEO_PBEND_LABEL_XPOS         VIDEO_LABEL_XPOS
-#define VIDEO_PBEND_LABEL_YPOS         221
-#define VIDEO_PBEND_LABEL_XSIZE                VIDEO_LABEL_XSIZE
-#define VIDEO_PBEND_LABEL_YSIZE                VIDEO_LABEL_YSIZE
-#define VIDEO_PBEND_SYMBOL_XPOS                VIDEO_SYMBOL_XPOS
-#define VIDEO_PBEND_SYMBOL_YPOS                221
-#define VIDEO_PBEND_SYMBOL_XSIZE       27
-#define VIDEO_PBEND_SYMBOL_YSIZE       VIDEO_SYMBOL_YSIZE
-
-#define VIDEO_WARP_LABEL_XPOS          VIDEO_LABEL_XPOS
-#define VIDEO_WARP_LABEL_YPOS          165
-#define VIDEO_WARP_LABEL_XSIZE         VIDEO_LABEL_XSIZE
-#define VIDEO_WARP_LABEL_YSIZE         VIDEO_LABEL_YSIZE
-#define VIDEO_WARP_SYMBOL_XPOS         VIDEO_SYMBOL_XPOS
-#define VIDEO_WARP_SYMBOL_YPOS         165
-#define VIDEO_WARP_SYMBOL_XSIZE                27
-#define VIDEO_WARP_SYMBOL_YSIZE                VIDEO_SYMBOL_YSIZE
-#define VIDEO_WARP2_SYMBOL_XPOS                VIDEO_SYMBOL_XPOS
-#define VIDEO_WARP2_SYMBOL_YPOS                152
-#define VIDEO_WARP2_SYMBOL_XSIZE       27
-#define VIDEO_WARP2_SYMBOL_YSIZE       VIDEO_SYMBOL_YSIZE
-
-#define VIDEO_1STEP_SYMBOL_XPOS                (VIDEO_SYMBOL_XPOS + 18)
-#define VIDEO_1STEP_SYMBOL_YPOS                139
-#define VIDEO_1STEP_SYMBOL_XSIZE       (VIDEO_SYMBOL_XSIZE - 18)
-#define VIDEO_1STEP_SYMBOL_YSIZE       VIDEO_SYMBOL_YSIZE
-
-#define PG_X3(x)                       (DOOR_GFX_PAGEX3 + (x))
-#define PG_X4(x)                       (DOOR_GFX_PAGEX4 + (x))
-#define PG_X5(x)                       (DOOR_GFX_PAGEX5 + (x))
-#define PG_X6(x)                       (DOOR_GFX_PAGEX6 + (x))
-
-#define PG_Y1(y)                       (DOOR_GFX_PAGEY1 + (y))
-#define PG_Y2(y)                       (DOOR_GFX_PAGEY2 + (y))
+// ============================================================================
+// video tape definitions
+// ============================================================================
 
 #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  |       \
                                         VIDEO_STATE_FFWD_OFF   |       \
+                                        VIDEO_STATE_WARP_OFF   |       \
+                                        VIDEO_STATE_WARP2_OFF  |       \
                                         VIDEO_STATE_PBEND_OFF  |       \
                                         VIDEO_STATE_1STEP_OFF)
 #define VIDEO_PRESS_OFF                        (VIDEO_PRESS_PLAY_OFF   |       \
@@ -156,11 +72,14 @@ 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   |       \
                                         VIDEO_STATE_FFWD_ON    |       \
+                                        VIDEO_STATE_WARP_ON    |       \
+                                        VIDEO_STATE_WARP2_ON   |       \
                                         VIDEO_STATE_PBEND_ON   |       \
                                         VIDEO_STATE_1STEP_ON)
 #define VIDEO_PRESS_ON                 (VIDEO_PRESS_PLAY_ON    |       \
@@ -177,243 +96,91 @@ 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
 
 
-/* ========================================================================= */
-/* video display functions                                                   */
-/* ========================================================================= */
+// ============================================================================
+// video display functions
+// ============================================================================
 
-void DrawVideoDisplay(unsigned int state, unsigned int value)
+static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
 {
   int i, j, k;
-  static char *monatsname[12] =
-  {
-    "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
-    "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
-  };
 
-#if 0
   static struct
   {
-    int gd_x1, gd_y1;
-    int gd_x2, gd_y2;
-    int x, y;
-    int width, height;
+    int graphic;
+    struct XY *pos;
   }
   video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] =
   {
     {
-      {
-       PG_X4(VIDEO_PLAY_LABEL_XPOS),   PG_Y2(VIDEO_PLAY_LABEL_YPOS),
-       PG_X3(VIDEO_PLAY_LABEL_XPOS),   PG_Y2(VIDEO_PLAY_LABEL_YPOS),
-       VIDEO_PLAY_LABEL_XPOS,          VIDEO_PLAY_LABEL_YPOS,
-       VIDEO_PLAY_LABEL_XSIZE,         VIDEO_PLAY_LABEL_YSIZE
-      },
-      {
-       PG_X4(VIDEO_PLAY_SYMBOL_XPOS),  PG_Y2(VIDEO_PLAY_SYMBOL_YPOS),
-       PG_X3(VIDEO_PLAY_SYMBOL_XPOS),  PG_Y2(VIDEO_PLAY_SYMBOL_YPOS),
-       VIDEO_PLAY_SYMBOL_XPOS,         VIDEO_PLAY_SYMBOL_YPOS,
-       VIDEO_PLAY_SYMBOL_XSIZE,        VIDEO_PLAY_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       PG_X4(VIDEO_REC_LABEL_XPOS),    PG_Y2(VIDEO_REC_LABEL_YPOS),
-       PG_X3(VIDEO_REC_LABEL_XPOS),    PG_Y2(VIDEO_REC_LABEL_YPOS),
-       VIDEO_REC_LABEL_XPOS,           VIDEO_REC_LABEL_YPOS,
-       VIDEO_REC_LABEL_XSIZE,          VIDEO_REC_LABEL_YSIZE
-      },
-      {
-       PG_X4(VIDEO_REC_SYMBOL_XPOS),   PG_Y2(VIDEO_REC_SYMBOL_YPOS),
-       PG_X3(VIDEO_REC_SYMBOL_XPOS),   PG_Y2(VIDEO_REC_SYMBOL_YPOS),
-       VIDEO_REC_SYMBOL_XPOS,          VIDEO_REC_SYMBOL_YPOS,
-       VIDEO_REC_SYMBOL_XSIZE,         VIDEO_REC_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       PG_X4(VIDEO_PAUSE_LABEL_XPOS),  PG_Y2(VIDEO_PAUSE_LABEL_YPOS),
-       PG_X3(VIDEO_PAUSE_LABEL_XPOS),  PG_Y2(VIDEO_PAUSE_LABEL_YPOS),
-       VIDEO_PAUSE_LABEL_XPOS,         VIDEO_PAUSE_LABEL_YPOS,
-       VIDEO_PAUSE_LABEL_XSIZE,        VIDEO_PAUSE_LABEL_YSIZE
-      },
-      {
-       PG_X4(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS),
-       PG_X3(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS),
-       VIDEO_PAUSE_SYMBOL_XPOS,        VIDEO_PAUSE_SYMBOL_YPOS,
-       VIDEO_PAUSE_SYMBOL_XSIZE,       VIDEO_PAUSE_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       PG_X4(VIDEO_DATE_LABEL_XPOS),   PG_Y2(VIDEO_DATE_LABEL_YPOS),
-       PG_X3(VIDEO_DATE_LABEL_XPOS),   PG_Y2(VIDEO_DATE_LABEL_YPOS),
-       VIDEO_DATE_LABEL_XPOS,          VIDEO_DATE_LABEL_YPOS,
-       VIDEO_DATE_LABEL_XSIZE,         VIDEO_DATE_LABEL_YSIZE
-      },
-      {
-       PG_X4(VIDEO_DATE_XPOS),         PG_Y2(VIDEO_DATE_YPOS),
-       PG_X3(VIDEO_DATE_XPOS),         PG_Y2(VIDEO_DATE_YPOS),
-       VIDEO_DATE_XPOS,                VIDEO_DATE_YPOS,
-       VIDEO_DATE_XSIZE,               VIDEO_DATE_YSIZE
-      }
-    },
-    {
-      {
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1
-      },
-      {
-       PG_X4(VIDEO_TIME_XPOS),         PG_Y2(VIDEO_TIME_YPOS),
-       PG_X3(VIDEO_TIME_XPOS),         PG_Y2(VIDEO_TIME_YPOS),
-       VIDEO_TIME_XPOS,                VIDEO_TIME_YPOS,
-       VIDEO_TIME_XSIZE,               VIDEO_TIME_YSIZE
-      }
-    },
-    {
-      {
-       PG_X6(VIDEO_FFWD_LABEL_XPOS),   PG_Y1(VIDEO_FFWD_LABEL_YPOS),
-       PG_X3(VIDEO_LABEL_XPOS),        PG_Y2(VIDEO_LABEL_YPOS),
-       VIDEO_LABEL_XPOS,               VIDEO_LABEL_YPOS,
-       VIDEO_LABEL_XSIZE,              VIDEO_LABEL_YSIZE
-      },
-      {
-       PG_X6(VIDEO_FFWD_SYMBOL_XPOS),  PG_Y1(VIDEO_FFWD_SYMBOL_YPOS),
-       PG_X3(VIDEO_FFWD_SYMBOL_XPOS),  PG_Y2(VIDEO_SYMBOL_YPOS),
-       VIDEO_SYMBOL_XPOS,              VIDEO_SYMBOL_YPOS,
-       VIDEO_FFWD_SYMBOL_XSIZE,        VIDEO_FFWD_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       PG_X6(VIDEO_PBEND_LABEL_XPOS),  PG_Y1(VIDEO_PBEND_LABEL_YPOS),
-       PG_X3(VIDEO_LABEL_XPOS),        PG_Y2(VIDEO_LABEL_YPOS),
-       VIDEO_LABEL_XPOS,               VIDEO_LABEL_YPOS,
-       VIDEO_LABEL_XSIZE,              VIDEO_LABEL_YSIZE
-      },
-      {
-       PG_X6(VIDEO_PBEND_SYMBOL_XPOS), PG_Y1(VIDEO_PBEND_SYMBOL_YPOS),
-       PG_X3(VIDEO_PBEND_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS),
-       VIDEO_SYMBOL_XPOS,              VIDEO_SYMBOL_YPOS,
-       VIDEO_PBEND_SYMBOL_XSIZE,       VIDEO_PBEND_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       PG_X6(VIDEO_WARP_LABEL_XPOS),   PG_Y1(VIDEO_WARP_LABEL_YPOS),
-       PG_X3(VIDEO_LABEL_XPOS),        PG_Y2(VIDEO_LABEL_YPOS),
-       VIDEO_LABEL_XPOS,               VIDEO_LABEL_YPOS,
-       VIDEO_LABEL_XSIZE,              VIDEO_LABEL_YSIZE
-      },
-      {
-       PG_X6(VIDEO_WARP_SYMBOL_XPOS),  PG_Y1(VIDEO_WARP_SYMBOL_YPOS),
-       PG_X3(VIDEO_WARP_SYMBOL_XPOS),  PG_Y2(VIDEO_SYMBOL_YPOS),
-       VIDEO_SYMBOL_XPOS,              VIDEO_SYMBOL_YPOS,
-       VIDEO_WARP_SYMBOL_XSIZE,        VIDEO_WARP_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1
-      },
-      {
-       PG_X6(VIDEO_WARP2_SYMBOL_XPOS), PG_Y1(VIDEO_WARP2_SYMBOL_YPOS),
-       PG_X3(VIDEO_WARP2_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS),
-       VIDEO_SYMBOL_XPOS,              VIDEO_SYMBOL_YPOS,
-       VIDEO_WARP2_SYMBOL_XSIZE,       VIDEO_WARP2_SYMBOL_YSIZE
-      }
-    },
-    {
-      {
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1,
-       -1,                             -1
-      },
-      {
-       PG_X6(VIDEO_1STEP_SYMBOL_XPOS), PG_Y1(VIDEO_1STEP_SYMBOL_YPOS),
-       PG_X3(VIDEO_1STEP_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS),
-       VIDEO_1STEP_SYMBOL_XPOS,        VIDEO_SYMBOL_YPOS,
-       VIDEO_1STEP_SYMBOL_XSIZE,       VIDEO_1STEP_SYMBOL_YSIZE
-      }
+      { IMG_GFX_TAPE_LABEL_PLAY,               &tape.label.play        },
+      { IMG_GFX_TAPE_SYMBOL_PLAY,              &tape.symbol.play       },
     },
-  };
-#endif
-
-#if 1
-  static struct
-  {
-    int graphic;
-    struct Rect *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_RECORD,             &tape.label.record      },
+      { IMG_GFX_TAPE_SYMBOL_RECORD,            &tape.symbol.record     },
     },
     {
-      { IMG_TAPE_LABEL_GFX_RECORD,             &tape.label.record      },
-      { IMG_TAPE_SYMBOL_GFX_RECORD,            &tape.symbol.record     },
+      { IMG_GFX_TAPE_LABEL_PAUSE,              &tape.label.pause       },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE,             &tape.symbol.pause      },
     },
     {
-      { IMG_TAPE_LABEL_GFX_PAUSE,              &tape.label.pause       },
-      { IMG_TAPE_SYMBOL_GFX_PAUSE,             &tape.symbol.pause      },
+      { IMG_GFX_TAPE_LABEL_DATE,               &tape.label.date        },
+      { -1,                                    NULL                    },
     },
     {
-      { IMG_TAPE_LABEL_GFX_DATE,               &tape.label.date        },
+      { IMG_GFX_TAPE_LABEL_TIME,               &tape.label.time        },
       { -1,                                    NULL                    },
     },
     {
-      { IMG_TAPE_LABEL_GFX_TIME,               &tape.label.time        },
+      // (no label for displaying optional frame)
+      { -1,                                    NULL                    },
       { -1,                                    NULL                    },
     },
     {
-      { IMG_TAPE_LABEL_GFX_FAST_FORWARD,       &tape.label.fast_forward  },
-      { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD,      &tape.symbol.fast_forward },
+      { 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 },
     },
   };
 
-  for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++)       /* on or off states */
+  for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++)       // on or off states
   {
-    for (i = 0; i < NUM_TAPE_FUNCTIONS; i++)           /* record, play, ... */
+    for (i = 0; i < NUM_TAPE_FUNCTIONS; i++)           // record, play, ...
     {
-      for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++)    /* label or symbol */
+      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 =
@@ -422,194 +189,237 @@ void DrawVideoDisplay(unsigned int state, unsigned int value)
          if (value == skip_value)
            continue;
 
-         if (k == 1)           /* on */
+         if (k == 1)           // on
          {
            gd_bitmap = gfx->bitmap;
            gd_x = gfx->src_x;
            gd_y = gfx->src_y;
          }
-         else                  /* off */
+         else                  // off
          {
            gd_bitmap = gfx_bg->bitmap;
            gd_x = gfx_bg->src_x + pos->x;
            gd_y = gfx_bg->src_y + pos->y;
          }
 
-         /* some tape graphics may be undefined -- only draw if defined */
+         // some tape graphics may be undefined -- only draw if defined
          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;
        }
       }
     }
   }
+}
 
-#else
 
-  for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++)       /* on or off states */
-  {
-    for (i = 0; i < NUM_TAPE_FUNCTIONS; i++)           /* record, play, ... */
-    {
-      for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++)    /* label or symbol */
-      {
-       if (state & (1 << (i * 2 + k)))
-       {
-         int gd_x, gd_y;
-         int skip_value =
-           (j == 0 ? VIDEO_DISPLAY_SYMBOL_ONLY : VIDEO_DISPLAY_LABEL_ONLY);
+#define DATETIME_NONE                  (0)
 
-         if (k == 1)           /* on */
-         {
-           gd_x = video_pos[i][j].gd_x1;
-           gd_y = video_pos[i][j].gd_y1;
-         }
-         else                  /* off */
-         {
-           gd_x = video_pos[i][j].gd_x2;
-           gd_y = video_pos[i][j].gd_y2;
-         }
+#define DATETIME_DATE_YYYY             (1 << 0)
+#define DATETIME_DATE_YY               (1 << 1)
+#define DATETIME_DATE_MON              (1 << 2)
+#define DATETIME_DATE_MM               (1 << 3)
+#define DATETIME_DATE_DD               (1 << 4)
 
-         if (video_pos[i][j].x != -1 && value != skip_value)
-           BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-                      gd_x, gd_y,
-                      video_pos[i][j].width,
-                      video_pos[i][j].height,
-                      VX + video_pos[i][j].x,
-                      VY + video_pos[i][j].y);
-       }
-      }
-    }
-  }
-#endif
+#define DATETIME_TIME_HH               (1 << 5)
+#define DATETIME_TIME_MIN              (1 << 6)
+#define DATETIME_TIME_MM               (1 << 7)
+#define DATETIME_TIME_SS               (1 << 8)
 
-#if 1
-  if (state & VIDEO_STATE_DATE_ON)
-  {
-    struct TextPosInfo *pos = &tape.text.date;
-    int tag = value % 100;
-    int monat = (value/100) % 100;
-    int jahr = (value/10000);
+#define DATETIME_FRAME                 (1 << 9)
 
-    DrawText(VX + pos->x,      VY + pos->y, int2str(tag, 2),   pos->font);
-    DrawText(VX + pos->x + 27, VY + pos->y, monatsname[monat], pos->font);
-    DrawText(VX + pos->x + 64, VY + pos->y, int2str(jahr, 2),  pos->font);
-  }
+#define DATETIME_XOFFSET_1             (1 << 10)
+#define DATETIME_XOFFSET_2             (1 << 11)
 
-  if (state & VIDEO_STATE_TIME_ON)
-  {
-    struct TextPosInfo *pos = &tape.text.time;
-    int min = value / 60;
-    int sec = value % 60;
+#define DATETIME_DATE                  (DATETIME_DATE_YYYY     |       \
+                                        DATETIME_DATE_YY       |       \
+                                        DATETIME_DATE_MON      |       \
+                                        DATETIME_DATE_MM       |       \
+                                        DATETIME_DATE_DD)
 
-    DrawText(VX + pos->x,      VY + pos->y, int2str(min, 2), pos->font);
-    DrawText(VX + pos->x + 27, VY + pos->y, int2str(sec, 2), pos->font);
-  }
+#define DATETIME_TIME                  (DATETIME_TIME_HH       |       \
+                                        DATETIME_TIME_MIN      |       \
+                                        DATETIME_TIME_MM       |       \
+                                        DATETIME_TIME_SS)
+
+#define MAX_DATETIME_STRING_SIZE       32
 
-#else
+static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
+{
+  int i;
 
-  if (state & VIDEO_STATE_DATE_ON)
+  static char *month_shortnames[] =
   {
-    int tag = value % 100;
-    int monat = (value/100) % 100;
-    int jahr = (value/10000);
+    "JAN",
+    "FEB",
+    "MAR",
+    "APR",
+    "MAY",
+    "JUN",
+    "JUL",
+    "AUG",
+    "SEP",
+    "OCT",
+    "NOV",
+    "DEC"
+  };
 
-    DrawText(VX + VIDEO_DATE_XPOS, VY + VIDEO_DATE_YPOS,
-            int2str(tag, 2), FONT_TAPE_RECORDER);
-    DrawText(VX + VIDEO_DATE_XPOS + 27, VY + VIDEO_DATE_YPOS,
-            monatsname[monat], FONT_TAPE_RECORDER);
-    DrawText(VX + VIDEO_DATE_XPOS + 64, VY + VIDEO_DATE_YPOS,
-            int2str(jahr, 2), FONT_TAPE_RECORDER);
+  static struct
+  {
+    struct TextPosInfo *pos;
+    int type;
   }
+  datetime_info[] =
+  {
+    { &tape.text.date,         DATETIME_DATE_DD                        },
+    { &tape.text.date,         DATETIME_DATE_MON | DATETIME_XOFFSET_1  },
+    { &tape.text.date,         DATETIME_DATE_YY  | DATETIME_XOFFSET_2  },
+    { &tape.text.date_yyyy,    DATETIME_DATE_YYYY                      },
+    { &tape.text.date_yy,      DATETIME_DATE_YY                        },
+    { &tape.text.date_mon,     DATETIME_DATE_MON                       },
+    { &tape.text.date_mm,      DATETIME_DATE_MM                        },
+    { &tape.text.date_dd,      DATETIME_DATE_DD                        },
+
+    { &tape.text.time,         DATETIME_TIME_MIN                       },
+    { &tape.text.time,         DATETIME_TIME_SS  | DATETIME_XOFFSET_1  },
+    { &tape.text.time_hh,      DATETIME_TIME_HH                        },
+    { &tape.text.time_mm,      DATETIME_TIME_MM                        },
+    { &tape.text.time_ss,      DATETIME_TIME_SS                        },
+
+    { &tape.text.frame,                DATETIME_FRAME                          },
+
+    { NULL,                    DATETIME_NONE                           },
+  };
 
-  if (state & VIDEO_STATE_TIME_ON)
+  for (i = 0; datetime_info[i].pos != NULL; i++)
   {
-    int min = value / 60;
-    int sec = value % 60;
+    struct TextPosInfo *pos = datetime_info[i].pos;
+    int type = datetime_info[i].type;
+    int xpos, ypos;
 
-    DrawText(VX + VIDEO_TIME_XPOS, VY + VIDEO_TIME_YPOS,
-            int2str(min, 2), FONT_TAPE_RECORDER);
-    DrawText(VX + VIDEO_TIME_XPOS + 27, VY + VIDEO_TIME_YPOS,
-            int2str(sec, 2), FONT_TAPE_RECORDER);
-  }
-#endif
+    if (pos->x == -1 &&
+       pos->y == -1)
+      continue;
 
-  redraw_mask |= REDRAW_DOOR_2;
+    xpos = VX + pos->x + (type & DATETIME_XOFFSET_1 ? pos->xoffset  :
+                         type & DATETIME_XOFFSET_2 ? pos->xoffset2 : 0);
+    ypos = VY + pos->y;
+
+    if ((type & DATETIME_DATE) && (state & VIDEO_STATE_DATE_ON))
+    {
+      char s[MAX_DATETIME_STRING_SIZE];
+      int year2 = value / 10000;
+      int year4 = (year2 < 70 ? 2000 + year2 : 1900 + year2);
+      int month_index = (value / 100) % 100;
+      int month = month_index + 1;
+      int day = value % 100;
+
+      strcpy(s, (type & DATETIME_DATE_YYYY ? int2str(year4, 4) :
+                type & DATETIME_DATE_YY   ? int2str(year2, 2) :
+                type & DATETIME_DATE_MON  ? month_shortnames[month_index] :
+                type & DATETIME_DATE_MM   ? int2str(month, 2) :
+                type & DATETIME_DATE_DD   ? int2str(day, 2) : ""));
+
+      DrawText(xpos, ypos, s, pos->font);
+    }
+    else if ((type & DATETIME_TIME) && (state & VIDEO_STATE_TIME_ON))
+    {
+      char s[MAX_DATETIME_STRING_SIZE];
+      int hh = (value / 3600) % 100;
+      int min = value / 60;
+      int mm = (value / 60) % 60;
+      int ss = value % 60;
+
+      strcpy(s, (type & DATETIME_TIME_HH  ? int2str(hh, 2) :
+                type & DATETIME_TIME_MIN ? int2str(min, 2) :
+                type & DATETIME_TIME_MM  ? int2str(mm, 2) :
+                type & DATETIME_TIME_SS  ? int2str(ss, 2) : ""));
+
+      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);
+    }
+  }
 }
 
-void DrawCompleteVideoDisplay()
+void DrawVideoDisplay(unsigned int state, unsigned int value)
 {
-#if 0
-  printf("::: %d, %d  /  %d, %d [%d] [%d, %d] [%d/%d]\n",
-        VX, VY, EX, EY, game_status, gfx.vx, gfx.vy,
-        tape.date, tape.length);
-#endif
+  DrawVideoDisplay_Graphics(state, value);
+  DrawVideoDisplay_DateTime(state, value);
+}
 
-#if 1
+static void DrawVideoDisplayLabel(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_LABEL_ONLY);
+}
 
-  struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
+static void DrawVideoDisplaySymbol(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
+}
 
-  /* draw tape background */
-  BlitBitmap(g_tape->bitmap, drawto, g_tape->src_x, g_tape->src_y,
-            gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy);
+static void DrawVideoDisplayCurrentState(void)
+{
+  int state = 0;
 
-  /* draw tape buttons (forced) */
-  UnmapTapeButtons();
-  MapTapeButtons();
+  DrawVideoDisplay(VIDEO_STATE_OFF, 0);
 
-#else
+  if (tape.pausing)
+    state |= VIDEO_STATE_PAUSE_ON;
 
-#if 1
-  struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
-  int tape_button_graphics[] =
-  {
-    IMG_TAPE_BUTTON_GFX_EJECT,
-    IMG_TAPE_BUTTON_GFX_STOP,
-    IMG_TAPE_BUTTON_GFX_PAUSE,
-    IMG_TAPE_BUTTON_GFX_RECORD,
-    IMG_TAPE_BUTTON_GFX_PLAY
-  };
-  struct Rect *tape_button_positions[] =
+  if (tape.recording)
   {
-    &tape.button.eject,
-    &tape.button.stop,
-    &tape.button.pause,
-    &tape.button.record,
-    &tape.button.play
-  };
-  int i;
+    state |= VIDEO_STATE_REC_ON;
 
-  BlitBitmap(g_tape->bitmap, drawto, g_tape->src_x, g_tape->src_y,
-            gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy);
-
-  for (i = 0; i < SIZEOF_ARRAY_INT(tape_button_graphics); i++)
+    if (tape.single_step)
+      state |= VIDEO_STATE_1STEP_ON;
+  }
+  else if (tape.playing)
   {
-    struct GraphicInfo *g = &graphic_info[tape_button_graphics[i]];
-    struct Rect *pos = tape_button_positions[i];
+    state |= VIDEO_STATE_PLAY_ON;
 
-    BlitBitmap(g->bitmap, drawto, g->src_x, g->src_y,
-              g->width, g->height, gfx.vx + pos->x, gfx.vy + pos->y);
+    if (!tape.pausing)
+    {
+      if (tape.deactivate_display)
+       state |= VIDEO_STATE_WARP2_ON;
+      else if (tape.warp_forward)
+       state |= VIDEO_STATE_WARP_ON;
+      else if (tape.fast_forward)
+       state |= VIDEO_STATE_FFWD_ON;
+
+      if (tape.pause_before_end)
+       state |= VIDEO_STATE_PBEND_ON;
+    }
   }
-#else
-  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-            DOOR_GFX_PAGEX3, DOOR_GFX_PAGEY2,
+
+  // draw labels and symbols separately to prevent labels overlapping symbols
+  DrawVideoDisplayLabel(state);
+  DrawVideoDisplaySymbol(state);
+}
+
+void DrawCompleteVideoDisplay(void)
+{
+  struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
+
+  // draw tape background
+  BlitBitmap(g_tape->bitmap, drawto, g_tape->src_x, g_tape->src_y,
             gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy);
-  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-            DOOR_GFX_PAGEX4 + VIDEO_CONTROL_XPOS,
-            DOOR_GFX_PAGEY2 + VIDEO_CONTROL_YPOS,
-            VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE,
-            gfx.vx + VIDEO_CONTROL_XPOS, gfx.vy + VIDEO_CONTROL_YPOS);
-#endif
 
-#endif
+  // draw tape buttons (forced)
+  RedrawOrRemapTapeButtons();
 
   DrawVideoDisplay(VIDEO_ALL_OFF, 0);
 
-#if 1
   if (tape.recording)
   {
     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);
@@ -619,6 +429,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);
@@ -627,25 +438,14 @@ 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);
   }
-#else
-  if (tape.date && tape.length)
-  {
-    DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
-    DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
-  }
-#endif
 
-#if 1
   BlitBitmap(drawto, bitmap_db_door_2, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
             0, 0);
-#else
-  BlitBitmap(drawto, bitmap_db_door, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
-            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
-#endif
 }
 
-void TapeDeactivateDisplayOn()
+void TapeDeactivateDisplayOn(void)
 {
   SetDrawDeactivationMask(REDRAW_FIELD);
   audio.sound_deactivated = TRUE;
@@ -658,15 +458,62 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 
   if (redraw_display)
   {
-    RedrawPlayfield(TRUE, 0,0,0,0);
+    RedrawPlayfield();
     DrawGameDoorValues();
   }
 }
 
 
-/* ========================================================================= */
-/* tape control functions                                                    */
-/* ========================================================================= */
+// ============================================================================
+// tape logging functions
+// ============================================================================
+
+static char tape_patch_info[MAX_OUTPUT_LINESIZE];
+
+static void PrintTapeReplayProgress(boolean replay_finished)
+{
+  static unsigned int counter_last = -1;
+  unsigned int counter = Counter();
+  unsigned int counter_seconds  = counter / 1000;
+
+  if (!replay_finished)
+  {
+    unsigned int counter_delay = 50;
+
+    if (counter > counter_last + counter_delay)
+    {
+      PrintNoLog("\r");
+      PrintNoLog("Tape %03d %s[%02d:%02d]: [%02d:%02d] - playing tape ... ",
+                level_nr,  tape_patch_info,
+                tape.length_seconds / 60, tape.length_seconds % 60,
+                TapeTime / 60, TapeTime % 60);
+
+      counter_last = counter;
+    }
+  }
+  else
+  {
+    float tape_length_seconds = GetTapeLengthSecondsFloat();
+
+    PrintNoLog("\r");
+    Print("Tape %03d %s[%02d:%02d]: (%02d:%02d.%03d / %.2f %%) - %s.\n",
+         level_nr, tape_patch_info,
+         tape.length_seconds / 60, tape.length_seconds % 60,
+         counter_seconds / 60, counter_seconds % 60, counter % 1000,
+         (float)counter / tape_length_seconds / 10,
+         tape.auto_play_level_fixed ? "solved and fixed" :
+         tape.auto_play_level_solved ? "solved" :
+         tape.auto_play_level_not_fixable ? "NOT SOLVED, NOT FIXED" :
+         "NOT SOLVED");
+
+    counter_last = -1;
+  }
+}
+
+
+// ============================================================================
+// tape control functions
+// ============================================================================
 
 void TapeSetDateFromEpochSeconds(time_t epoch_seconds)
 {
@@ -675,17 +522,20 @@ void TapeSetDateFromEpochSeconds(time_t epoch_seconds)
   tape.date = 10000 * (lt->tm_year % 100) + 100 * lt->tm_mon + lt->tm_mday;
 }
 
-void TapeSetDateFromNow()
+void TapeSetDateFromNow(void)
 {
   TapeSetDateFromEpochSeconds(time(NULL));
 }
 
-void TapeErase()
+void TapeErase(void)
 {
   int i;
 
+  CopyTapeToUndoBuffer();
+
   tape.counter = 0;
   tape.length = 0;
+  tape.length_frames = 0;
   tape.length_seconds = 0;
 
   if (leveldir_current)
@@ -708,13 +558,17 @@ void TapeErase()
 
   tape.centered_player_nr_next = -1;
   tape.set_centered_player = FALSE;
+
+  // set flags for game actions to default values (may be overwritten later)
+  tape.use_key_actions = TRUE;
+  tape.use_mouse_actions = FALSE;
 }
 
-static void TapeRewind()
+static void TapeRewind(void)
 {
   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;
@@ -722,6 +576,8 @@ static void TapeRewind()
   tape.deactivate_display = FALSE;
   tape.auto_play = (global.autoplay_leveldir != NULL);
   tape.auto_play_level_solved = FALSE;
+  tape.auto_play_level_fixed = FALSE;
+  tape.auto_play_level_not_fixable = FALSE;
   tape.quick_resume = FALSE;
   tape.single_step = FALSE;
 
@@ -750,64 +606,68 @@ 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();
 
   SetDrawDeactivationMask(REDRAW_NONE);
   audio.sound_deactivated = FALSE;
+
+  // required here to update video display if tape door is closed
+  if (GetDoorState() & DOOR_CLOSE_2)
+    OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 }
 
-static void TapeStartGameRecording()
+static void TapeStartGameRecording(void)
 {
-  TapeStartRecording(level.random_seed);
-
-#if defined(NETWORK_AVALIABLE)
-  if (options.network)
-  {
-    SendToServer_StartPlaying();
-
-    return;
-  }
-#endif
-
-  InitGame();
+  StartGameActions(network.enabled, TRUE, level.random_seed);
 }
 
-static void TapeAppendRecording()
+static void TapeAppendRecording(void)
 {
   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);
   DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0);
 
-#if 1
   UpdateAndDisplayGameControlValues();
-#endif
 }
 
-void TapeHaltRecording()
+void TapeHaltRecording(void)
 {
-  if (!tape.recording)
-    return;
-
   tape.counter++;
-  tape.pos[tape.counter].delay = 0;
+
+  // initialize delay for next tape entry (to be able to continue recording)
+  if (tape.counter < MAX_TAPE_LEN)
+    tape.pos[tape.counter].delay = 0;
 
   tape.length = tape.counter;
-  tape.length_seconds = GetTapeLength();
+  tape.length_frames = GetTapeLengthFrames();
+  tape.length_seconds = GetTapeLengthSeconds();
 }
 
-void TapeStopRecording()
+void TapeStopRecording(void)
 {
-  TapeHaltRecording();
+  if (tape.recording)
+    TapeHaltRecording();
 
   tape.recording = FALSE;
   tape.pausing = FALSE;
@@ -816,43 +676,23 @@ void TapeStopRecording()
   MapTapeEjectButton();
 }
 
-void TapeRecordAction(byte action_raw[MAX_PLAYERS])
+boolean TapeAddAction(byte action[MAX_TAPE_ACTIONS])
 {
-  byte action[MAX_PLAYERS];
   int i;
 
-  if (!tape.recording)         /* (record action even when tape is paused) */
-    return;
-
-  if (tape.counter >= MAX_TAPE_LEN - 1)
-  {
-    TapeStopRecording();
-    return;
-  }
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-    action[i] = action_raw[i];
-
-  if (tape.set_centered_player)
-  {
-    for (i = 0; i < MAX_PLAYERS; i++)
-      if (tape.centered_player_nr_next == i ||
-         tape.centered_player_nr_next == -1)
-       action[i] |= KEY_SET_FOCUS;
-
-    tape.set_centered_player = FALSE;
-  }
-
-  if (tape.pos[tape.counter].delay > 0)                /* already stored action */
+  if (tape.pos[tape.counter].delay > 0)                // already stored action
   {
     boolean changed_events = FALSE;
 
-    for (i = 0; i < MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_TAPE_ACTIONS; i++)
       if (tape.pos[tape.counter].action[i] != action[i])
        changed_events = TRUE;
 
     if (changed_events || tape.pos[tape.counter].delay >= 255)
     {
+      if (tape.counter >= MAX_TAPE_LEN - 1)
+       return FALSE;
+
       tape.counter++;
       tape.pos[tape.counter].delay = 0;
     }
@@ -860,56 +700,101 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS])
       tape.pos[tape.counter].delay++;
   }
 
-  if (tape.pos[tape.counter].delay == 0)       /* store new action */
+  if (tape.pos[tape.counter].delay == 0)       // store new action
   {
-    for (i = 0; i < MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_TAPE_ACTIONS; i++)
       tape.pos[tape.counter].action[i] = action[i];
 
     tape.pos[tape.counter].delay++;
   }
+
+  return TRUE;
 }
 
-void TapeTogglePause(boolean toggle_manual)
+void TapeRecordAction(byte action_raw[MAX_TAPE_ACTIONS])
 {
-  int state = 0;
+  byte action[MAX_TAPE_ACTIONS];
+  int i;
+
+  if (!tape.recording)         // (record action even when tape is paused)
+    return;
+
+  for (i = 0; i < MAX_TAPE_ACTIONS; i++)
+    action[i] = action_raw[i];
+
+  if (tape.use_key_actions && tape.set_centered_player)
+  {
+    for (i = 0; i < MAX_PLAYERS; i++)
+      if (tape.centered_player_nr_next == i ||
+         tape.centered_player_nr_next == -1)
+       action[i] |= KEY_SET_FOCUS;
+
+    tape.set_centered_player = FALSE;
+  }
+
+  if (!TapeAddAction(action))
+    TapeStopRecording();
+}
+
+void TapeTogglePause(boolean toggle_mode)
+{
+  if (tape.playing && tape.pausing && (toggle_mode & TAPE_TOGGLE_PLAY_PAUSE))
+  {
+    // continue playing in normal mode
+    tape.fast_forward = FALSE;
+    tape.warp_forward = FALSE;
+    tape.deactivate_display = FALSE;
 
-  if (tape.pause_before_death)
-    state |= VIDEO_STATE_PBEND_OFF;
-  else if (tape.fast_forward)
-    state |= VIDEO_STATE_FFWD_OFF;
+    tape.pause_before_end = FALSE;
+  }
 
   tape.pausing = !tape.pausing;
-  tape.fast_forward = FALSE;
-  tape.pause_before_death = FALSE;
 
-  if (tape.single_step && toggle_manual)
+  if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL))
     tape.single_step = FALSE;
 
-  state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
-  if (tape.playing)
-    state |= VIDEO_STATE_PLAY_ON;
-  else
-    state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF);
+  DrawVideoDisplayCurrentState();
 
-  DrawVideoDisplay(state, 0);
+  if (tape.deactivate_display)
+  {
+    if (tape.pausing)
+      TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+    else
+      TapeDeactivateDisplayOn();
+  }
 
-  if (tape.warp_forward)
+  if (tape.quick_resume)
   {
+    tape.quick_resume = FALSE;
+
     TapeStopWarpForward();
+    TapeAppendRecording();
 
-    if (tape.quick_resume)
-    {
-      tape.quick_resume = FALSE;
+    if (!CheckEngineSnapshotSingle())
+      SaveEngineSnapshotSingle();
+
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
 
-      TapeAppendRecording();
+    // do not map undo/redo buttons after quick loading tape
+    return;
+  }
 
-      if (!CheckEngineSnapshot())
-       SaveEngineSnapshot();
+  if (game_status == GAME_MODE_PLAYING)
+  {
+    if (setup.show_snapshot_buttons && CheckEngineSnapshotList())
+    {
+      if (tape.pausing)
+       MapUndoRedoButtons();
+      else if (!tape.single_step)
+       UnmapUndoRedoButtons();
     }
+
+    ModifyPauseButtons();
   }
 }
 
-void TapeStartPlaying()
+void TapeStartPlaying(void)
 {
   if (TAPE_IS_EMPTY(tape))
     return;
@@ -924,6 +809,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();
 
@@ -931,14 +817,14 @@ void TapeStartPlaying()
   audio.sound_deactivated = FALSE;
 }
 
-static void TapeStartGamePlaying()
+static void TapeStartGamePlaying(void)
 {
   TapeStartPlaying();
 
   InitGame();
 }
 
-void TapeStopPlaying()
+void TapeStopPlaying(void)
 {
   tape.playing = FALSE;
   tape.pausing = FALSE;
@@ -950,94 +836,86 @@ void TapeStopPlaying()
   MapTapeEjectButton();
 }
 
-byte *TapePlayAction()
+byte *TapePlayAction(void)
 {
-  static byte action[MAX_PLAYERS];
+  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_TAPE_ACTIONS];
   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)
+    if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
+      TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
 
       return NULL;
     }
   }
-  else if (tape.fast_forward)
+
+  if (tape.counter >= tape.length)     // end of tape reached
   {
-    if ((FrameCounter / 20) % 2)
-      DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY);
+    if (tape.warp_forward && !tape.auto_play)
+    {
+      TapeStopWarpForward();
+      TapeTogglePause(TAPE_TOGGLE_MANUAL);
+    }
     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);
+      TapeStop();
     }
+
+    return NULL;
   }
 
-#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);
+    int state = 0;
 
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-  }
-#endif
+    if (tape.warp_forward)
+      state |= VIDEO_STATE_WARP(update_draw_label_on);
+    else if (tape.fast_forward)
+      state |= VIDEO_STATE_FFWD(update_draw_label_on);
 
-  if (tape.counter >= tape.length)     /* end of tape reached */
-  {
-    if (tape.warp_forward && !tape.auto_play)
-      TapeTogglePause(TAPE_TOGGLE_MANUAL);
-    else
-      TapeStop();
+    if (tape.pause_before_end)
+      state |= VIDEO_STATE_PBEND(update_draw_label_on);
 
-    return NULL;
+    // draw labels and symbols separately to prevent labels overlapping symbols
+    DrawVideoDisplayLabel(state);
+    DrawVideoDisplaySymbol(state);
   }
 
-  for (i = 0; i < MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_TAPE_ACTIONS; i++)
     action[i] = tape.pos[tape.counter].action[i];
 
+#if DEBUG_TAPE_WHEN_PLAYING
+  DebugContinued("", "%05d", FrameCounter);
+  for (i = 0; i < MAX_TAPE_ACTIONS; i++)
+    DebugContinued("", "   %08x", action[i]);
+  DebugContinued("tape:play", "\n");
+#endif
+
   tape.set_centered_player = FALSE;
   tape.centered_player_nr_next = -999;
 
-  for (i = 0; i < MAX_PLAYERS; i++)
+  if (tape.use_key_actions)
   {
-    if (action[i] & KEY_SET_FOCUS)
+    for (i = 0; i < MAX_PLAYERS; i++)
     {
-      tape.set_centered_player = TRUE;
-      tape.centered_player_nr_next =
-       (tape.centered_player_nr_next == -999 ? i : -1);
-    }
+      if (action[i] & KEY_SET_FOCUS)
+      {
+       tape.set_centered_player = TRUE;
+       tape.centered_player_nr_next =
+         (tape.centered_player_nr_next == -999 ? i : -1);
+      }
 
-    action[i] &= ~KEY_SET_FOCUS;
+      action[i] &= ~KEY_SET_FOCUS;
+    }
   }
 
   tape.delay_played++;
@@ -1047,11 +925,17 @@ byte *TapePlayAction()
     tape.delay_played = 0;
   }
 
+  if (tape.auto_play)
+    PrintTapeReplayProgress(FALSE);
+
   return action;
 }
 
-void TapeStop()
+void TapeStop(void)
 {
+  if (tape.pausing)
+    TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
   TapeStopRecording();
   TapeStopPlaying();
 
@@ -1061,63 +945,64 @@ 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(void)
 {
-  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 * GAME_FRAME_DELAY / 1000);
+  return tape_length_frames;
 }
 
-static void TapeStartWarpForward()
+unsigned int GetTapeLengthSeconds(void)
 {
-  tape.warp_forward = TRUE;
+  return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000);
+}
 
-  if (!tape.fast_forward && !tape.pause_before_death)
-  {
-    tape.pausing = FALSE;
-    tape.deactivate_display = TRUE;
+static float GetTapeLengthSecondsFloat(void)
+{
+  return ((float)GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000);
+}
 
+static void TapeStartWarpForward(int mode)
+{
+  tape.fast_forward = (mode & AUTOPLAY_FFWD);
+  tape.warp_forward = (mode & AUTOPLAY_WARP);
+  tape.deactivate_display = (mode & AUTOPLAY_WARP_NO_DISPLAY);
+
+  tape.pausing = FALSE;
+
+  if (tape.deactivate_display)
     TapeDeactivateDisplayOn();
-  }
 
-  if (tape.fast_forward || tape.pause_before_death)
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
-  else
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, 0);
+  DrawVideoDisplayCurrentState();
 }
 
-static void TapeStopWarpForward()
+static void TapeStopWarpForward(void)
 {
-  int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
-
+  tape.fast_forward = FALSE;
   tape.warp_forward = FALSE;
   tape.deactivate_display = FALSE;
 
-  TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+  tape.pause_before_end = FALSE;
 
-  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;
+  TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
 
-  DrawVideoDisplay(state, 0);
+  DrawVideoDisplayCurrentState();
 }
 
-static void TapeSingleStep()
+static void TapeSingleStep(void)
 {
-  if (options.network)
+  if (network.enabled)
     return;
 
   if (!tape.pausing)
@@ -1125,11 +1010,10 @@ 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()
+void TapeQuickSave(void)
 {
   if (game_status == GAME_MODE_MAIN)
   {
@@ -1142,7 +1026,7 @@ void TapeQuickSave()
     return;
 
   if (tape.recording)
-    TapeHaltRecording();       /* prepare tape for saving on-the-fly */
+    TapeHaltRecording();       // prepare tape for saving on-the-fly
 
   if (TAPE_IS_EMPTY(tape))
   {
@@ -1152,10 +1036,10 @@ void TapeQuickSave()
   }
 
   if (SaveTapeChecked(tape.level_nr))
-    SaveEngineSnapshot();
+    SaveEngineSnapshotSingle();
 }
 
-void TapeQuickLoad()
+void TapeQuickLoad(void)
 {
   char *filename = getTapeFilename(level_nr);
 
@@ -1177,11 +1061,11 @@ void TapeQuickLoad()
   if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
     return;
 
-  if (CheckEngineSnapshot())
+  if (CheckEngineSnapshotSingle())
   {
     TapeStartGamePlaying();
 
-    LoadEngineSnapshot();
+    LoadEngineSnapshotSingle();
 
     DrawCompleteVideoDisplay();
 
@@ -1191,6 +1075,9 @@ void TapeQuickLoad()
     TapeStopWarpForward();
     TapeAppendRecording();
 
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
+
     if (FrameCounter > 0)
       return;
   }
@@ -1203,11 +1090,11 @@ void TapeQuickLoad()
   if (!TAPE_IS_EMPTY(tape))
   {
     TapeStartGamePlaying();
-    TapeStartWarpForward();
+    TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY);
 
     tape.quick_resume = TRUE;
   }
-  else /* this should not happen (basically checked above) */
+  else // this should not happen (basically checked above)
   {
     int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
 
@@ -1215,61 +1102,229 @@ void TapeQuickLoad()
   }
 }
 
-void InsertSolutionTape()
+boolean hasSolutionTape(void)
 {
-  if (!TAPE_IS_EMPTY(tape))
-    return;
+  boolean tape_file_exists = fileExists(getSolutionTapeFilename(level_nr));
+  boolean level_has_tape = (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
+                           level.native_sp_level->demo.is_available);
+
+  return (tape_file_exists || level_has_tape);
+}
+
+boolean InsertSolutionTape(void)
+{
+  if (!hasSolutionTape())
+  {
+    Request("No solution tape for this level!", REQ_CONFIRM);
+
+    return FALSE;
+  }
+
+  if (!TAPE_IS_STOPPED(tape))
+    TapeStop();
+
+  // if tape recorder already contains a tape, remove it without asking
+  TapeErase();
 
   LoadSolutionTape(level_nr);
 
+  DrawCompleteVideoDisplay();
+
   if (TAPE_IS_EMPTY(tape))
-    Request("No solution tape for this level!", REQ_CONFIRM);
+  {
+    Request("Loading solution tape for this level failed!", REQ_CONFIRM);
+
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+boolean PlaySolutionTape(void)
+{
+  if (!InsertSolutionTape())
+    return FALSE;
+
+  TapeStartGamePlaying();
+
+  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;
+
+  /* fix single-player tapes that contain player input for more than one
+     player (due to a bug in 3.3.1.2 and earlier versions), which results
+     in playing levels with more than one player in multi-player mode,
+     even though the tape was originally recorded in single-player mode */
+
+  // remove player input actions for all players but the first one
+  for (i = 1; i < MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
+
+  tape.changed = TRUE;
+}
+
 
-/* ------------------------------------------------------------------------- *
- * tape autoplay functions
- * ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// tape autoplay functions
+// ----------------------------------------------------------------------------
 
-void AutoPlayTape()
+void AutoPlayTapes(void)
 {
   static LevelDirTree *autoplay_leveldir = NULL;
   static boolean autoplay_initialized = FALSE;
   static int autoplay_level_nr = -1;
   static int num_levels_played = 0;
   static int num_levels_solved = 0;
+  static int num_tapes_patched = 0;
   static int num_tape_missing = 0;
   static boolean level_failed[MAX_TAPES_PER_SET];
-#if 0
-  static boolean tape_missing[MAX_TAPES_PER_SET];
-#endif
+  static int patch_nr = 0;
+  static char *patch_name[] =
+  {
+    "original tape",
+    "em_random_bug",
+
+    NULL
+  };
+  static int patch_version_first[] =
+  {
+    VERSION_IDENT(0,0,0,0),
+    VERSION_IDENT(3,3,1,0),
+
+    -1
+  };
+  static int patch_version_last[] =
+  {
+    VERSION_IDENT(9,9,9,9),
+    VERSION_IDENT(4,0,1,1),
+
+    -1
+  };
+  static byte patch_property_bit[] =
+  {
+    TAPE_PROPERTY_NONE,
+    TAPE_PROPERTY_EM_RANDOM_BUG,
+
+    -1
+  };
   int i;
 
   if (autoplay_initialized)
   {
-    /* just finished auto-playing tape */
-    printf("%s.\n", tape.auto_play_level_solved ? "solved" : "NOT SOLVED");
+    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+    {
+      if (tape.auto_play_level_solved)
+      {
+       if (patch_nr > 0)
+       {
+         // level solved by patched tape -- save fixed tape
+         char *filename = getTapeFilename(level_nr);
+         char *filename_orig = getStringCat2(filename, ".orig");
+
+         // create backup from old tape, if not yet existing
+         if (!fileExists(filename_orig))
+           rename(filename, filename_orig);
+
+         SaveTapeToFilename(filename);
+
+         tape.auto_play_level_fixed = TRUE;
+         num_tapes_patched++;
+       }
+
+       // continue with next tape
+       patch_nr = 0;
+      }
+      else if (patch_name[patch_nr + 1] != NULL)
+      {
+       // level not solved by patched tape -- continue with next patch
+       patch_nr++;
+      }
+      else
+      {
+       // level not solved by any patched tape -- continue with next tape
+       tape.auto_play_level_not_fixable = TRUE;
+       patch_nr = 0;
+      }
+    }
+
+    // just finished auto-playing tape
+    PrintTapeReplayProgress(TRUE);
 
-    num_levels_played++;
+    if (patch_nr == 0)
+      num_levels_played++;
 
     if (tape.auto_play_level_solved)
       num_levels_solved++;
-    else if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
-      level_failed[level_nr] = TRUE;
+
+    if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
+      level_failed[level_nr] = !tape.auto_play_level_solved;
   }
   else
   {
     DrawCompleteVideoDisplay();
+
     audio.sound_enabled = FALSE;
+    setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF);
 
     autoplay_leveldir = getTreeInfoFromIdentifier(leveldir_first,
                                                  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;
 
@@ -1280,154 +1335,358 @@ void AutoPlayTape()
 
     autoplay_level_nr = autoplay_leveldir->first_level;
 
-    printf_line("=", 79);
-    printf("Automatically playing level tapes\n");
-    printf_line("-", 79);
-    printf("Level series identifier: '%s'\n", autoplay_leveldir->identifier);
-    printf("Level series name:       '%s'\n", autoplay_leveldir->name);
-    printf("Level series author:     '%s'\n", autoplay_leveldir->author);
-    printf("Number of levels:        %d\n",   autoplay_leveldir->levels);
-    printf_line("=", 79);
-    printf("\n");
+    PrintLine("=", 79);
+    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+      Print("Automatically fixing level tapes\n");
+    else
+      Print("Automatically playing level tapes\n");
+    PrintLine("-", 79);
+    Print("Level series identifier: '%s'\n", autoplay_leveldir->identifier);
+    Print("Level series name:       '%s'\n", autoplay_leveldir->name);
+    Print("Level series author:     '%s'\n", autoplay_leveldir->author);
+    Print("Number of levels:        %d\n",   autoplay_leveldir->levels);
+    PrintLine("=", 79);
+    Print("\n");
 
     for (i = 0; i < MAX_TAPES_PER_SET; i++)
-    {
       level_failed[i] = FALSE;
-#if 0
-      tape_missing[i] = FALSE;
-#endif
-    }
+
+    // only private tapes may be modified
+    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+      options.mytapes = TRUE;
 
     autoplay_initialized = TRUE;
   }
 
-  while (autoplay_level_nr <= autoplay_leveldir->last_level)
+  while (1)
   {
-    level_nr = autoplay_level_nr++;
+    if (global.autoplay_mode != AUTOPLAY_MODE_FIX || patch_nr == 0)
+      level_nr = autoplay_level_nr++;
+
+    if (level_nr > autoplay_leveldir->last_level)
+      break;
+
+    // set patch info (required for progress output)
+    strcpy(tape_patch_info, "");
+    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+      snprintf(tape_patch_info, MAX_OUTPUT_LINESIZE, "[%-13s] ",
+              patch_name[patch_nr]);
 
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
     TapeErase();
 
-    printf("Level %03d: ", level_nr);
-
     LoadLevel(level_nr);
-    if (level.no_valid_file)
+
+    if (level.no_level_file || level.no_valid_file)
     {
-      printf("(no level)\n");
+      Print("Tape %03d: (no level found)\n", level_nr);
+
       continue;
     }
 
 #if 0
-    /* ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY */
-    printf("(only testing level)\n");
+    // ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY
+    Print("Tape %03d: (only testing level)\n", level_nr);
     continue;
 #endif
 
-    LoadSolutionTape(level_nr);
+    if (options.mytapes)
+      LoadTape(level_nr);
+    else
+      LoadSolutionTape(level_nr);
 
     if (tape.no_valid_file)
     {
       num_tape_missing++;
-#if 0
-      if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
-       tape_missing[level_nr] = TRUE;
-#endif
 
-      printf("(no tape)\n");
+      Print("Tape %03d: (no tape found)\n", level_nr);
+
       continue;
     }
 
-    printf("playing tape ... ");
+    if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+    {
+      if (tape.engine_version < patch_version_first[patch_nr] ||
+         tape.engine_version > patch_version_last[patch_nr])
+      {
+       Print("Tape %03d %s[%02d:%02d]: (%s %d.%d.%d.%d) - skipped.\n",
+             level_nr,  tape_patch_info,
+             tape.length_seconds / 60, tape.length_seconds % 60,
+             "not suitable for version",
+             (tape.engine_version / 1000000) % 100,
+             (tape.engine_version / 10000  ) % 100,
+             (tape.engine_version / 100    ) % 100,
+             (tape.engine_version          ) % 100);
+
+       if (patch_name[patch_nr + 1] != NULL)
+       {
+         // continue with next patch
+         patch_nr++;
+       }
+       else
+       {
+         // continue with next tape
+         patch_nr = 0;
+       }
+
+       continue;
+      }
+
+      tape.property_bits |= patch_property_bit[patch_nr];
+    }
+
+    InitCounter();
 
     TapeStartGamePlaying();
-    TapeStartWarpForward();
+    TapeStartWarpForward(global.autoplay_mode);
 
     return;
   }
 
-  printf("\n");
-  printf_line("=", 79);
-  printf("Number of levels played: %d\n", num_levels_played);
-  printf("Number of levels solved: %d (%d%%)\n", num_levels_solved,
-        (num_levels_played ? num_levels_solved * 100 / num_levels_played :0));
-  printf_line("-", 79);
-  printf("Summary (for automatic parsing by scripts):\n");
-  printf("LEVELDIR '%s', SOLVED %d/%d (%d%%)",
-        autoplay_leveldir->identifier, num_levels_solved, num_levels_played,
-        (num_levels_played ? num_levels_solved * 100 / num_levels_played :0));
+  Print("\n");
+  PrintLine("=", 79);
+  Print("Number of levels played: %d\n", num_levels_played);
+  Print("Number of levels solved: %d (%d%%)\n", num_levels_solved,
+       (num_levels_played ? num_levels_solved * 100 / num_levels_played : 0));
+  if (global.autoplay_mode == AUTOPLAY_MODE_FIX)
+    Print("Number of tapes fixed: %d\n", num_tapes_patched);
+  PrintLine("-", 79);
+  Print("Summary (for automatic parsing by scripts):\n");
+  Print("LEVELDIR [%s] '%s', SOLVED %d/%d (%d%%)",
+       (num_levels_played == num_levels_solved ? " OK " : "WARN"),
+       autoplay_leveldir->identifier, num_levels_solved, num_levels_played,
+       (num_levels_played ? num_levels_solved * 100 / num_levels_played : 0));
 
   if (num_levels_played != num_levels_solved)
   {
-    printf(", FAILED:");
+    Print(", FAILED:");
     for (i = 0; i < MAX_TAPES_PER_SET; i++)
       if (level_failed[i])
-       printf(" %03d", i);
+       Print(" %03d", i);
   }
 
-#if 0
-  if (num_tape_missing > 0)
+  Print("\n");
+  PrintLine("=", 79);
+
+  CloseAllAndExit(0);
+}
+
+
+// ----------------------------------------------------------------------------
+// tape patch functions
+// ----------------------------------------------------------------------------
+
+static boolean PatchTape(struct TapeInfo *tape, char *mode)
+{
+  Print("[%d.%d.%d.%d]: ",
+       (tape->engine_version / 1000000) % 100,
+       (tape->engine_version / 10000  ) % 100,
+       (tape->engine_version / 100    ) % 100,
+       (tape->engine_version          ) % 100);
+
+  if (strEqual(mode, "info"))
   {
-    printf(", NO TAPE:");
-    for (i = 0; i < MAX_TAPES_PER_SET; i++)
-      if (tape_missing[i])
-       printf(" %03d", i);
+    Print("property bits == 0x%02x\n", tape->property_bits);
+
+    return FALSE;
   }
-#endif
 
-  printf("\n");
-  printf_line("=", 79);
+  byte property_bits = tape->property_bits;
+  byte property_bitmask = 0;
+  boolean set_property_bit = TRUE;
+
+  if (strSuffix(mode, ":0") ||
+      strSuffix(mode, ":off") ||
+      strSuffix(mode, ":clear"))
+    set_property_bit = FALSE;
+
+  if (strEqual(mode, "em_random_bug") || strPrefix(mode, "em_random_bug:"))
+  {
+    // this bug was introduced in version 3.3.1.0 and fixed in version 4.0.1.2
+    if (tape->engine_version <  VERSION_IDENT(3,3,1,0) ||
+       tape->engine_version >= VERSION_IDENT(4,0,1,2))
+    {
+      Print("This tape version cannot be patched against EM random bug!\n");
+
+      return FALSE;
+    }
+
+    property_bitmask = TAPE_PROPERTY_EM_RANDOM_BUG;
+  }
+  else
+  {
+    Print("Unknown patch mode '%s'!\n", mode);
+
+    return FALSE;
+  }
+
+  if (set_property_bit)
+    property_bits |= property_bitmask;
+  else
+    property_bits &= ~property_bitmask;
+
+  if (property_bits == tape->property_bits)
+  {
+    Print("Tape already patched for '%s'!\n", mode);
+
+    return FALSE;
+  }
+
+  Print("Patching for '%s' ... ", mode);
+
+  tape->property_bits = property_bits;
+
+  return TRUE;
+}
+
+void PatchTapes(void)
+{
+  static LevelDirTree *patchtapes_leveldir = NULL;
+  static int num_tapes_found = 0;
+  static int num_tapes_patched = 0;
+  char *mode = global.patchtapes_mode;
+  int i;
+
+  if (strEqual(mode, "help"))
+  {
+    PrintLine("=", 79);
+    Print("Supported patch modes:\n");
+    Print("- \"em_random_bug\"   - use 64-bit random value bug for EM engine\n");
+    PrintLine("-", 79);
+    Print("Supported modifiers:\n");
+    Print("- add \":0\", \":off\" or \":clear\" to patch mode to un-patch tape file\n");
+    PrintLine("=", 79);
+
+    CloseAllAndExit(0);
+  }
+
+  patchtapes_leveldir = getTreeInfoFromIdentifier(leveldir_first,
+                                                 global.patchtapes_leveldir);
+
+  if (patchtapes_leveldir == NULL)
+    Fail("no such level identifier: '%s'", global.patchtapes_leveldir);
+
+  leveldir_current = patchtapes_leveldir;
+
+  if (patchtapes_leveldir->first_level < 0)
+    patchtapes_leveldir->first_level = 0;
+  if (patchtapes_leveldir->last_level >= MAX_TAPES_PER_SET)
+    patchtapes_leveldir->last_level = MAX_TAPES_PER_SET - 1;
+
+  PrintLine("=", 79);
+  Print("Patching level tapes for patch mode '%s'\n", mode);
+  PrintLine("-", 79);
+  Print("Level series identifier: '%s'\n", patchtapes_leveldir->identifier);
+  Print("Level series name:       '%s'\n", patchtapes_leveldir->name);
+  Print("Level series author:     '%s'\n", patchtapes_leveldir->author);
+  Print("Number of levels:        %d\n",   patchtapes_leveldir->levels);
+  PrintLine("=", 79);
+  Print("\n");
+
+  int first_level = patchtapes_leveldir->first_level;
+  int last_level = patchtapes_leveldir->last_level;
+
+  for (i = first_level; i <= last_level; i++)
+  {
+    if (!global.patchtapes_all && !global.patchtapes_level[i])
+      continue;
+
+    Print("Tape %03d: ", i);
+
+    TapeErase();
+    LoadTape(i);
+
+    if (tape.no_valid_file)
+    {
+      Print("(no tape found)\n");
+
+      continue;
+    }
+
+    num_tapes_found++;
+
+    if (PatchTape(&tape, mode))
+    {
+      char *filename = getTapeFilename(i);
+      char *filename_orig = getStringCat2(filename, ".orig");
+
+      if (!fileExists(filename_orig))
+       rename(filename, filename_orig);
+
+      SaveTapeToFilename(filename);
+
+      Print("patched tape saved.\n");
+
+      num_tapes_patched++;
+    }
+  }
+
+  Print("\n");
+  PrintLine("=", 79);
+  Print("Number of tapes found: %d\n", num_tapes_found);
+  Print("Number of tapes patched: %d\n", num_tapes_patched);
+  PrintLine("=", 79);
 
   CloseAllAndExit(0);
 }
 
 
-/* ---------- new tape button stuff ---------------------------------------- */
+// ---------- new tape button stuff -------------------------------------------
 
 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,
+    // (same position as "eject" button)
+    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"
+  },
+  {
+    IMG_GFX_TAPE_BUTTON_INSERT_SOLUTION,&tape.button.insert_solution,
+    TAPE_CTRL_ID_INSERT_SOLUTION,      "insert solution tape"
+  },
+  {
+    IMG_GFX_TAPE_BUTTON_PLAY_SOLUTION, &tape.button.play_solution,
+    TAPE_CTRL_ID_PLAY_SOLUTION,                "play solution tape"
   }
 };
 
-void CreateTapeButtons()
+void CreateTapeButtons(void)
 {
   int i;
 
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
   {
-    struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic];
-    struct Rect *pos = tapebutton_info[i].pos;
+    int graphic = tapebutton_info[i].graphic;
+    struct GraphicInfo *gfx = &graphic_info[graphic];
+    struct XY *pos = tapebutton_info[i].pos;
     struct GadgetInfo *gi;
     int gd_x = gfx->src_x;
     int gd_y = gfx->src_y;
@@ -1436,6 +1695,7 @@ void CreateTapeButtons()
     int id = i;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, tapebutton_info[i].infotext,
                      GDI_X, VX + pos->x,
                      GDI_Y, VY + pos->y,
@@ -1451,13 +1711,13 @@ void CreateTapeButtons()
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     tape_gadget[id] = gi;
   }
 }
 
-void FreeTapeButtons()
+void FreeTapeButtons(void)
 {
   int i;
 
@@ -1465,19 +1725,19 @@ void FreeTapeButtons()
     FreeGadget(tape_gadget[i]);
 }
 
-void MapTapeEjectButton()
+void MapTapeEjectButton(void)
 {
   UnmapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]);
   MapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]);
 }
 
-void MapTapeWarpButton()
+void MapTapeWarpButton(void)
 {
   UnmapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]);
   MapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]);
 }
 
-void MapTapeButtons()
+void MapTapeButtons(void)
 {
   int i;
 
@@ -1489,15 +1749,43 @@ void MapTapeButtons()
     MapTapeWarpButton();
 
   if (tape.show_game_buttons)
-    MapGameButtons();
+    MapGameButtonsOnTape();
 }
 
-void UnmapTapeButtons()
+void UnmapTapeButtons(void)
 {
   int i;
 
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
     UnmapGadget(tape_gadget[i]);
+
+  if (tape.show_game_buttons)
+    UnmapGameButtonsOnTape();
+}
+
+void RedrawTapeButtons(void)
+{
+  int i;
+
+  for (i = 0; i < NUM_TAPE_BUTTONS; i++)
+    RedrawGadget(tape_gadget[i]);
+
+  if (tape.show_game_buttons)
+    RedrawGameButtonsOnTape();
+}
+
+void RedrawOrRemapTapeButtons(void)
+{
+  if (tape_gadget[TAPE_CTRL_ID_PLAY]->mapped)
+  {
+    // tape buttons already mapped
+    RedrawTapeButtons();
+  }
+  else
+  {
+    UnmapTapeButtons();
+    MapTapeButtons();
+  }
 }
 
 static void HandleTapeButtonsExt(int id)
@@ -1520,7 +1808,7 @@ static void HandleTapeButtonsExt(int id)
       else
       {
        if (tape.changed)
-         SaveTapeChecked(tape.level_nr);
+         SaveTapeChecked(level_nr);
 
        TapeErase();
       }
@@ -1531,41 +1819,50 @@ static void HandleTapeButtonsExt(int id)
     case TAPE_CTRL_ID_EXTRA:
       if (tape.playing)
       {
-       if (!tape.warp_forward)                 /* PLAY -> WARP FORWARD PLAY */
-       {
-         TapeStartWarpForward();
-       }
-       else                                    /* WARP FORWARD PLAY -> PLAY */
-       {
-         TapeStopWarpForward();
-       }
+       tape.pause_before_end = !tape.pause_before_end;
+
+       DrawVideoDisplayCurrentState();
       }
       else if (tape.recording)
+      {
        TapeSingleStep();
+      }
 
       break;
 
     case TAPE_CTRL_ID_STOP:
       TapeStop();
+
       break;
 
     case TAPE_CTRL_ID_PAUSE:
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
       break;
 
     case TAPE_CTRL_ID_RECORD:
       if (TAPE_IS_STOPPED(tape))
+      {
        TapeStartGameRecording();
+      }
       else if (tape.pausing)
       {
-       if (tape.playing)                       /* PLAY -> PAUSE -> RECORD */
+       if (tape.playing)                       // PLAY -> PAUSE -> RECORD
          TapeAppendRecording();
        else
          TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
+
       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;
 
@@ -1575,31 +1872,46 @@ static void HandleTapeButtonsExt(int id)
       }
       else if (tape.playing)
       {
-       if (tape.pausing)                       /* PAUSE -> PLAY */
+       if (tape.pausing)                       // PAUSE -> PLAY
        {
-         TapeTogglePause(TAPE_TOGGLE_MANUAL);
+         TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE);
        }
-       else if (!tape.fast_forward)            /* PLAY -> FAST FORWARD PLAY */
+       else if (!tape.fast_forward)            // PLAY -> FFWD
        {
          tape.fast_forward = TRUE;
-         DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
        }
-       else if (!tape.pause_before_death)      /* FFWD PLAY -> AUTO PAUSE */
+       else if (!tape.warp_forward)            // FFWD -> WARP
        {
-         tape.pause_before_death = TRUE;
-         DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
+         tape.warp_forward = TRUE;
        }
-       else                                    /* AUTO PAUSE -> NORMAL PLAY */
+       else if (!tape.deactivate_display)      // WARP -> WARP BLIND
        {
-         if (tape.warp_forward)
-           TapeStopWarpForward();
+         tape.deactivate_display = TRUE;
 
+         TapeDeactivateDisplayOn();
+       }
+       else                                    // WARP BLIND -> PLAY
+       {
          tape.fast_forward = FALSE;
-         tape.pause_before_death = FALSE;
+         tape.warp_forward = FALSE;
+         tape.deactivate_display = FALSE;
 
-         DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
+         TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
        }
+
+       DrawVideoDisplayCurrentState();
       }
+
+      break;
+
+    case TAPE_CTRL_ID_INSERT_SOLUTION:
+      InsertSolutionTape();
+
+      break;
+
+    case TAPE_CTRL_ID_PLAY_SOLUTION:
+      PlaySolutionTape();
+
       break;
 
     default: