fixed bug with broken tape display when pausing in ffwd/warp/etc. modes
[rocksndiamonds.git] / src / tape.c
index 9f2a61f39bae0069976c9587c3d908289051250f..a8ac4cea12a6d9974f541302ac0f85fb3e782abc 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
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// tape.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
@@ -19,7 +17,9 @@
 #include "tools.h"
 #include "files.h"
 #include "network.h"
-#include "cartoons.h"
+#include "anim.h"
+
+#define DEBUG_TAPE_WHEN_PLAYING                        FALSE
 
 /* tape button identifiers */
 #define TAPE_CTRL_ID_EJECT                     0
@@ -45,105 +45,15 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 /* 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))
-
 #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 +66,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,7 +90,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
 
@@ -186,162 +99,61 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 /* video display functions                                                   */
 /* ========================================================================= */
 
-void DrawVideoDisplay(unsigned long state, unsigned long 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"
-  };
+
   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
-      }
+      { IMG_GFX_TAPE_LABEL_PLAY,               &tape.label.play        },
+      { IMG_GFX_TAPE_SYMBOL_PLAY,              &tape.symbol.play       },
     },
     {
-      {
-       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
-      }
+      { IMG_GFX_TAPE_LABEL_RECORD,             &tape.label.record      },
+      { IMG_GFX_TAPE_SYMBOL_RECORD,            &tape.symbol.record     },
     },
     {
-      {
-       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
-      }
+      { IMG_GFX_TAPE_LABEL_PAUSE,              &tape.label.pause       },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE,             &tape.symbol.pause      },
     },
     {
-      {
-       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
-      }
+      { IMG_GFX_TAPE_LABEL_DATE,               &tape.label.date        },
+      { -1,                                    NULL                    },
     },
     {
-      {
-       -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
-      }
+      { IMG_GFX_TAPE_LABEL_TIME,               &tape.label.time        },
+      { -1,                                    NULL                    },
     },
     {
-      {
-       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
-      }
+      /* (no label for displaying optional frame) */
+      { -1,                                    NULL                    },
+      { -1,                                    NULL                    },
     },
     {
-      {
-       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
-      }
+      { IMG_GFX_TAPE_LABEL_FAST_FORWARD,       &tape.label.fast_forward  },
+      { IMG_GFX_TAPE_SYMBOL_FAST_FORWARD,      &tape.symbol.fast_forward },
     },
     {
-      {
-       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
-      }
+      { IMG_GFX_TAPE_LABEL_WARP_FORWARD,       &tape.label.warp_forward  },
+      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD,      &tape.symbol.warp_forward },
     },
     {
-      {
-       -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
-      }
+      { IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind},
+      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind},
     },
     {
-      {
-       -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_PAUSE_BEFORE_END,   &tape.label.pause_before_end  },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END,  &tape.symbol.pause_before_end },
+    },
+    {
+      { IMG_GFX_TAPE_LABEL_SINGLE_STEP,                &tape.label.single_step  },
+      { IMG_GFX_TAPE_SYMBOL_SINGLE_STEP,       &tape.symbol.single_step },
     },
   };
 
@@ -351,83 +163,280 @@ void DrawVideoDisplay(unsigned long state, unsigned long value)
     {
       for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++)    /* label or symbol */
       {
+       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[graphic];
+         Bitmap *gd_bitmap;
          int gd_x, gd_y;
          int skip_value =
            (j == 0 ? VIDEO_DISPLAY_SYMBOL_ONLY : VIDEO_DISPLAY_LABEL_ONLY);
 
+         if (value == skip_value)
+           continue;
+
          if (k == 1)           /* on */
          {
-           gd_x = video_pos[i][j].gd_x1;
-           gd_y = video_pos[i][j].gd_y1;
+           gd_bitmap = gfx->bitmap;
+           gd_x = gfx->src_x;
+           gd_y = gfx->src_y;
          }
          else                  /* off */
          {
-           gd_x = video_pos[i][j].gd_x2;
-           gd_y = video_pos[i][j].gd_y2;
+           gd_bitmap = gfx_bg->bitmap;
+           gd_x = gfx_bg->src_x + pos->x;
+           gd_y = gfx_bg->src_y + pos->y;
          }
 
-         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);
+         /* 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;
        }
       }
     }
   }
+}
+
+
+#define DATETIME_NONE                  (0)
+
+#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)
+
+#define DATETIME_TIME_HH               (1 << 5)
+#define DATETIME_TIME_MIN              (1 << 6)
+#define DATETIME_TIME_MM               (1 << 7)
+#define DATETIME_TIME_SS               (1 << 8)
+
+#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       |       \
+                                        DATETIME_DATE_MON      |       \
+                                        DATETIME_DATE_MM       |       \
+                                        DATETIME_DATE_DD)
+
+#define DATETIME_TIME                  (DATETIME_TIME_HH       |       \
+                                        DATETIME_TIME_MIN      |       \
+                                        DATETIME_TIME_MM       |       \
+                                        DATETIME_TIME_SS)
+
+#define MAX_DATETIME_STRING_SIZE       32
+
+static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
+{
+  int i;
+
+  static char *month_shortnames[] =
+  {
+    "JAN",
+    "FEB",
+    "MAR",
+    "APR",
+    "MAY",
+    "JUN",
+    "JUL",
+    "AUG",
+    "SEP",
+    "OCT",
+    "NOV",
+    "DEC"
+  };
+
+  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_DATE_ON)
+  for (i = 0; datetime_info[i].pos != NULL; i++)
   {
-    int tag = value % 100;
-    int monat = (value/100) % 100;
-    int jahr = (value/10000);
-
-    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);
+    struct TextPosInfo *pos = datetime_info[i].pos;
+    int type = datetime_info[i].type;
+    int xpos, ypos;
+
+    if (pos->x == -1 &&
+       pos->y == -1)
+      continue;
+
+    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 DrawVideoDisplay(unsigned int state, unsigned int value)
+{
+  DrawVideoDisplay_Graphics(state, value);
+  DrawVideoDisplay_DateTime(state, value);
+}
+
+void DrawVideoDisplayLabel(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_LABEL_ONLY);
+}
+
+void DrawVideoDisplaySymbol(unsigned int state)
+{
+  DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
+}
+
+void DrawVideoDisplayCurrentState()
+{
+  int state = 0;
+
+  DrawVideoDisplay(VIDEO_STATE_OFF, 0);
 
-  if (state & VIDEO_STATE_TIME_ON)
+  if (tape.pausing)
+    state |= VIDEO_STATE_PAUSE_ON;
+
+  if (tape.recording)
   {
-    int min = value / 60;
-    int sec = value % 60;
+    state |= VIDEO_STATE_REC_ON;
 
-    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);
+    if (tape.single_step)
+      state |= VIDEO_STATE_1STEP_ON;
   }
+  else if (tape.playing)
+  {
+    state |= VIDEO_STATE_PLAY_ON;
 
-  redraw_mask |= REDRAW_DOOR_2;
+    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;
+    }
+  }
+
+  // draw labels and symbols separately to prevent labels overlapping symbols
+  DrawVideoDisplayLabel(state);
+  DrawVideoDisplaySymbol(state);
 }
 
 void DrawCompleteVideoDisplay()
 {
-  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-            DOOR_GFX_PAGEX3, DOOR_GFX_PAGEY2,
+  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);
+
+  /* draw tape buttons (forced) */
+  RedrawOrRemapTapeButtons();
 
   DrawVideoDisplay(VIDEO_ALL_OFF, 0);
-  if (tape.date && tape.length)
+
+  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);
+  }
+  else if (tape.playing)
+  {
+    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);
+  }
+  else if (tape.date && tape.length)
+  {
+    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, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
-            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
+  BlitBitmap(drawto, bitmap_db_door_2, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
+            0, 0);
 }
 
 void TapeDeactivateDisplayOn()
@@ -443,12 +452,50 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 
   if (redraw_display)
   {
-    RedrawPlayfield(TRUE, 0,0,0,0);
+    RedrawPlayfield();
     DrawGameDoorValues();
   }
 }
 
 
+/* ========================================================================= */
+/* tape logging functions                                                    */
+/* ========================================================================= */
+
+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("Level %03d [%02d:%02d]: [%02d:%02d] - playing tape ... ",
+                level_nr, tape.length_seconds / 60, tape.length_seconds % 60,
+                TapeTime / 60, TapeTime % 60);
+
+      counter_last = counter;
+    }
+  }
+  else
+  {
+    PrintNoLog("\r");
+    Print("Level %03d [%02d:%02d]: (%02d:%02d.%03d / %.2f %%) - %s.\n",
+         level_nr, 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_solved ? "solved" : "NOT SOLVED");
+
+    counter_last = -1;
+  }
+}
+
+
 /* ========================================================================= */
 /* tape control functions                                                    */
 /* ========================================================================= */
@@ -469,8 +516,10 @@ void TapeErase()
 {
   int i;
 
-  tape.length = 0;
   tape.counter = 0;
+  tape.length = 0;
+  tape.length_frames = 0;
+  tape.length_seconds = 0;
 
   if (leveldir_current)
     setString(&tape.level_identifier, leveldir_current->identifier);
@@ -498,7 +547,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;
@@ -515,12 +564,12 @@ static void TapeRewind()
   InitRND(tape.random_seed);
 }
 
-static void TapeSetRandomSeed(long random_seed)
+static void TapeSetRandomSeed(int random_seed)
 {
   tape.random_seed = InitRND(random_seed);
 }
 
-void TapeStartRecording(long random_seed)
+void TapeStartRecording(int random_seed)
 {
   if (!TAPE_IS_STOPPED(tape))
     TapeStop();
@@ -534,6 +583,8 @@ void TapeStartRecording(long 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);
@@ -561,19 +612,27 @@ 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);
   DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0);
 
-#if 1
   UpdateAndDisplayGameControlValues();
-#endif
 }
 
 void TapeHaltRecording()
@@ -585,7 +644,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()
@@ -652,43 +712,58 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS])
   }
 }
 
-void TapeTogglePause(boolean toggle_manual)
+void TapeTogglePause(boolean toggle_mode)
 {
-  int state = 0;
+  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();
 
-      TapeAppendRecording();
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
 
-      if (!CheckEngineSnapshot())
-       SaveEngineSnapshot();
-    }
+    // do not map undo/redo buttons after quick loading tape
+    return;
+  }
+
+  if (setup.show_snapshot_buttons &&
+      game_status == GAME_MODE_PLAYING &&
+      CheckEngineSnapshotList())
+  {
+    if (tape.pausing)
+      MapUndoRedoButtons();
+    else if (!tape.single_step)
+      UnmapUndoRedoButtons();
   }
 }
 
@@ -707,6 +782,8 @@ 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();
 
   SetDrawDeactivationMask(REDRAW_NONE);
@@ -734,79 +811,68 @@ 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)
     {
+      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++)
     action[i] = tape.pos[tape.counter].action[i];
 
+#if DEBUG_TAPE_WHEN_PLAYING
+  printf("%05d", FrameCounter);
+  for (i = 0; i < MAX_PLAYERS; i++)
+    printf("   %08x", action[i]);
+  printf("\n");
+#endif
+
   tape.set_centered_player = FALSE;
   tape.centered_player_nr_next = -999;
 
@@ -829,6 +895,9 @@ byte *TapePlayAction()
     tape.delay_played = 0;
   }
 
+  if (tape.auto_play)
+    PrintTapeReplayProgress(FALSE);
+
   return action;
 }
 
@@ -843,58 +912,54 @@ 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 * GAME_FRAME_DELAY / 1000);
+  return tape_length_frames;
 }
 
-static void TapeStartWarpForward()
+unsigned int GetTapeLengthSeconds()
 {
-  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 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()
 {
-  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()
@@ -907,15 +972,14 @@ 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()
 {
   if (game_status == GAME_MODE_MAIN)
   {
-    Request("No game that can be saved !", REQ_CONFIRM);
+    Request("No game that can be saved!", REQ_CONFIRM);
 
     return;
   }
@@ -928,13 +992,13 @@ void TapeQuickSave()
 
   if (TAPE_IS_EMPTY(tape))
   {
-    Request("No tape that can be saved !", REQ_CONFIRM);
+    Request("No tape that can be saved!", REQ_CONFIRM);
 
     return;
   }
 
   if (SaveTapeChecked(tape.level_nr))
-    SaveEngineSnapshot();
+    SaveEngineSnapshotSingle();
 }
 
 void TapeQuickLoad()
@@ -943,12 +1007,12 @@ void TapeQuickLoad()
 
   if (!fileExists(filename))
   {
-    Request("No tape for this level !", REQ_CONFIRM);
+    Request("No tape for this level!", REQ_CONFIRM);
 
     return;
   }
 
-  if (tape.recording && !Request("Stop recording and load tape ?",
+  if (tape.recording && !Request("Stop recording and load tape?",
                                 REQ_ASK | REQ_STAY_CLOSED))
   {
     OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
@@ -959,11 +1023,11 @@ void TapeQuickLoad()
   if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
     return;
 
-  if (CheckEngineSnapshot())
+  if (CheckEngineSnapshotSingle())
   {
     TapeStartGamePlaying();
 
-    LoadEngineSnapshot();
+    LoadEngineSnapshotSingle();
 
     DrawCompleteVideoDisplay();
 
@@ -973,6 +1037,9 @@ void TapeQuickLoad()
     TapeStopWarpForward();
     TapeAppendRecording();
 
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
+
     if (FrameCounter > 0)
       return;
   }
@@ -985,7 +1052,7 @@ void TapeQuickLoad()
   if (!TAPE_IS_EMPTY(tape))
   {
     TapeStartGamePlaying();
-    TapeStartWarpForward();
+    TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY);
 
     tape.quick_resume = TRUE;
   }
@@ -993,7 +1060,7 @@ void TapeQuickLoad()
   {
     int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
 
-    Request("No tape for this level !", REQ_CONFIRM | reopen_door);
+    Request("No tape for this level!", REQ_CONFIRM | reopen_door);
   }
 }
 
@@ -1005,7 +1072,7 @@ void InsertSolutionTape()
   LoadSolutionTape(level_nr);
 
   if (TAPE_IS_EMPTY(tape))
-    Request("No solution tape for this level !", REQ_CONFIRM);
+    Request("No solution tape for this level!", REQ_CONFIRM);
 
   DrawCompleteVideoDisplay();
 }
@@ -1024,13 +1091,12 @@ void AutoPlayTape()
   static int num_levels_solved = 0;
   static int num_tape_missing = 0;
   static boolean level_failed[MAX_TAPES_PER_SET];
-  static boolean tape_missing[MAX_TAPES_PER_SET];
   int i;
 
   if (autoplay_initialized)
   {
     /* just finished auto-playing tape */
-    printf("%s.\n", tape.auto_play_level_solved ? "solved" : "NOT SOLVED");
+    PrintTapeReplayProgress(TRUE);
 
     num_levels_played++;
 
@@ -1042,7 +1108,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);
@@ -1060,21 +1128,18 @@ 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);
+    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;
-      tape_missing[i] = FALSE;
-    }
 
     autoplay_initialized = TRUE;
   }
@@ -1088,72 +1153,64 @@ void AutoPlayTape()
 
     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("Level %03d: (no level)\n", level_nr);
+
       continue;
     }
 
 #if 0
     /* ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY */
-    printf("(only testing level)\n");
+    Print("Level %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 (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
-       tape_missing[level_nr] = TRUE;
 
-      printf("(no tape)\n");
+      Print("Level %03d: (no tape)\n", level_nr);
+
       continue;
     }
 
-    printf("playing tape ... ");
+    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,
+  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));
-  printf_line("-", 79);
-  printf("Summary (for automatic parsing by scripts):\n");
-  printf("LEVELDIR '%s', SOLVED %d/%d (%d%%)",
+  PrintLine("-", 79);
+  Print("Summary (for automatic parsing by scripts):\n");
+  Print("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));
 
   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);
-  }
-
-#if 0
-  if (num_tape_missing > 0)
-  {
-    printf(", NO TAPE:");
-    for (i = 0; i < MAX_TAPES_PER_SET; i++)
-      if (tape_missing[i])
-       printf(" %03d", i);
+       Print(" %03d", i);
   }
-#endif
 
-  printf("\n");
-  printf_line("=", 79);
+  Print("\n");
+  PrintLine("=", 79);
 
   CloseAllAndExit(0);
 }
@@ -1161,55 +1218,38 @@ void AutoPlayTape()
 
 /* ---------- new tape button stuff ---------------------------------------- */
 
-/* graphic position values for tape buttons */
-#define TAPE_BUTTON_XSIZE      18
-#define TAPE_BUTTON_YSIZE      18
-#define TAPE_BUTTON_XPOS       5
-#define TAPE_BUTTON_YPOS       77
-
-#define TAPE_BUTTON_EJECT_XPOS (TAPE_BUTTON_XPOS + 0 * TAPE_BUTTON_XSIZE)
-#define TAPE_BUTTON_EXTRA_XPOS (TAPE_BUTTON_XPOS + 0 * TAPE_BUTTON_XSIZE)
-#define TAPE_BUTTON_STOP_XPOS  (TAPE_BUTTON_XPOS + 1 * TAPE_BUTTON_XSIZE)
-#define TAPE_BUTTON_PAUSE_XPOS (TAPE_BUTTON_XPOS + 2 * TAPE_BUTTON_XSIZE)
-#define TAPE_BUTTON_RECORD_XPOS        (TAPE_BUTTON_XPOS + 3 * TAPE_BUTTON_XSIZE)
-#define TAPE_BUTTON_PLAY_XPOS  (TAPE_BUTTON_XPOS + 4 * TAPE_BUTTON_XSIZE)
-
 static struct
 {
-  int x, y;
+  int graphic;
+  struct XY *pos;
   int gadget_id;
   char *infotext;
 } tapebutton_info[NUM_TAPE_BUTTONS] =
 {
   {
-    TAPE_BUTTON_EJECT_XPOS,    TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_EJECT,
-    "eject tape"
+    IMG_GFX_TAPE_BUTTON_EJECT,         &tape.button.eject,
+    TAPE_CTRL_ID_EJECT,                        "eject tape"
   },
   {
-    TAPE_BUTTON_EXTRA_XPOS,    TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_EXTRA,
-    "extra functions"
+    /* (same position as "eject" button) */
+    IMG_GFX_TAPE_BUTTON_EXTRA,         &tape.button.eject,
+    TAPE_CTRL_ID_EXTRA,                        "extra functions"
   },
   {
-    TAPE_BUTTON_STOP_XPOS,     TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_STOP,
-    "stop tape"
+    IMG_GFX_TAPE_BUTTON_STOP,          &tape.button.stop,
+    TAPE_CTRL_ID_STOP,                 "stop tape"
   },
   {
-    TAPE_BUTTON_PAUSE_XPOS,    TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_PAUSE,
-    "pause tape"
+    IMG_GFX_TAPE_BUTTON_PAUSE,         &tape.button.pause,
+    TAPE_CTRL_ID_PAUSE,                        "pause tape"
   },
   {
-    TAPE_BUTTON_RECORD_XPOS,   TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_RECORD,
-    "record tape"
+    IMG_GFX_TAPE_BUTTON_RECORD,                &tape.button.record,
+    TAPE_CTRL_ID_RECORD,               "record tape"
   },
   {
-    TAPE_BUTTON_PLAY_XPOS,     TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_PLAY,
-    "play tape"
+    IMG_GFX_TAPE_BUTTON_PLAY,          &tape.button.play,
+    TAPE_CTRL_ID_PLAY,                 "play tape"
   }
 };
 
@@ -1219,34 +1259,25 @@ void CreateTapeButtons()
 
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
   {
-    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+    struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic];
+    struct XY *pos = tapebutton_info[i].pos;
     struct GadgetInfo *gi;
-    int gd_xoffset, gd_yoffset;
-    int gd_x1, gd_x2, gd_y;
+    int gd_x = gfx->src_x;
+    int gd_y = gfx->src_y;
+    int gd_xp = gfx->src_x + gfx->pressed_xoffset;
+    int gd_yp = gfx->src_y + gfx->pressed_yoffset;
     int id = i;
 
-    gd_xoffset = tapebutton_info[i].x;
-    gd_yoffset = tapebutton_info[i].y;
-    gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
-    gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
-    gd_y  = DOOR_GFX_PAGEY2 + gd_yoffset;
-
-    if (i == TAPE_CTRL_ID_EXTRA)
-    {
-      gd_x1 = DOOR_GFX_PAGEX6 + gd_xoffset;
-      gd_x2 = DOOR_GFX_PAGEX5 + gd_xoffset;
-    }
-
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_INFO_TEXT, tapebutton_info[i].infotext,
-                     GDI_X, VX + gd_xoffset,
-                     GDI_Y, VY + gd_yoffset,
-                     GDI_WIDTH, TAPE_BUTTON_XSIZE,
-                     GDI_HEIGHT, TAPE_BUTTON_YSIZE,
+                     GDI_X, VX + pos->x,
+                     GDI_Y, VY + pos->y,
+                     GDI_WIDTH, gfx->width,
+                     GDI_HEIGHT, gfx->height,
                      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
-                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+                     GDI_DESIGN_UNPRESSED, gfx->bitmap, gd_x, gd_y,
+                     GDI_DESIGN_PRESSED, gfx->bitmap, gd_xp, gd_yp,
                      GDI_DIRECT_DRAW, FALSE,
                      GDI_EVENT_MASK, GD_EVENT_RELEASED,
                      GDI_CALLBACK_ACTION, HandleTapeButtons,
@@ -1289,6 +1320,9 @@ void MapTapeButtons()
 
   if (tape.recording || tape.playing)
     MapTapeWarpButton();
+
+  if (tape.show_game_buttons)
+    MapGameButtons();
 }
 
 void UnmapTapeButtons()
@@ -1297,6 +1331,37 @@ void UnmapTapeButtons()
 
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
     UnmapGadget(tape_gadget[i]);
+
+  if (tape.show_game_buttons)
+    UnmapGameButtons();
+}
+
+void RedrawTapeButtons()
+{
+  int i;
+
+  for (i = 0; i < NUM_TAPE_BUTTONS; i++)
+    RedrawGadget(tape_gadget[i]);
+
+  if (tape.show_game_buttons)
+    RedrawGameButtons();
+
+  // RedrawGadget() may have set REDRAW_ALL if buttons are defined off-area
+  redraw_mask &= ~REDRAW_ALL;
+}
+
+void RedrawOrRemapTapeButtons()
+{
+  if (tape_gadget[TAPE_CTRL_ID_PLAY]->mapped)
+  {
+    // tape buttons already mapped
+    RedrawTapeButtons();
+  }
+  else
+  {
+    UnmapTapeButtons();
+    MapTapeButtons();
+  }
 }
 
 static void HandleTapeButtonsExt(int id)
@@ -1314,7 +1379,7 @@ static void HandleTapeButtonsExt(int id)
        LoadTape(level_nr);
 
        if (TAPE_IS_EMPTY(tape))
-         Request("No tape for this level !", REQ_CONFIRM);
+         Request("No tape for this level!", REQ_CONFIRM);
       }
       else
       {
@@ -1330,31 +1395,32 @@ 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 */
@@ -1362,9 +1428,17 @@ static void HandleTapeButtonsExt(int id)
        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;
 
@@ -1376,29 +1450,34 @@ static void HandleTapeButtonsExt(int id)
       {
        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;
 
     default:
@@ -1413,10 +1492,13 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 
 void HandleTapeButtonKeys(Key key)
 {
-  boolean use_extra = (tape.recording || tape.playing);
+  boolean eject_button_is_active = TAPE_IS_STOPPED(tape);
+  boolean extra_button_is_active = !eject_button_is_active;
 
-  if (key == setup.shortcut.tape_eject)
-    HandleTapeButtonsExt(use_extra ? TAPE_CTRL_ID_EXTRA : TAPE_CTRL_ID_EJECT);
+  if (key == setup.shortcut.tape_eject && eject_button_is_active)
+    HandleTapeButtonsExt(TAPE_CTRL_ID_EJECT);
+  else if (key == setup.shortcut.tape_extra && extra_button_is_active)
+    HandleTapeButtonsExt(TAPE_CTRL_ID_EXTRA);
   else if (key == setup.shortcut.tape_stop)
     HandleTapeButtonsExt(TAPE_CTRL_ID_STOP);
   else if (key == setup.shortcut.tape_pause)