updated contact info in source file headers
[rocksndiamonds.git] / src / tape.c
index 410ebb238b55612d99a73d2a402d4a2d32dfde40..4f1239171c65ed91e7aa58b494bedddd9be5a9a8 100644 (file)
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 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"
 
 #include "cartoons.h"
 
 /* tape button identifiers */
-#define TAPE_CTRL_ID_EJECT             0
-#define TAPE_CTRL_ID_INDEX             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_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 NUM_TAPE_BUTTONS               6
+#define NUM_TAPE_BUTTONS                       6
 
 /* values for tape handling */
 #define TAPE_PAUSE_SECONDS_BEFORE_DEATH                5
 
 /* forward declaration for internal use */
 static void HandleTapeButtons(struct GadgetInfo *);
-static void TapeStopIndexSearch();
+static void TapeStopWarpForward();
 
 static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 
@@ -46,205 +44,479 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 /* ========================================================================= */
 
 /* 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 + 1)
-#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 + 38)
-#define VIDEO_TIME_YPOS                (VIDEO_DISPLAY2_YPOS + 14)
-#define VIDEO_TIME_XSIZE       50
-#define VIDEO_TIME_YSIZE       16
-
-/* special */
-#define VIDEO_PBEND_LABEL_XPOS 5
-#define VIDEO_PBEND_LABEL_YPOS 220
-#define VIDEO_PBEND_LABEL_XSIZE        35
-#define VIDEO_PBEND_LABEL_YSIZE        30
-
-#define VIDEO_STATE_OFF                (VIDEO_STATE_PLAY_OFF   |       \
-                                VIDEO_STATE_REC_OFF    |       \
-                                VIDEO_STATE_PAUSE_OFF  |       \
-                                VIDEO_STATE_FFWD_OFF   |       \
-                                VIDEO_STATE_PBEND_OFF  |       \
-                                VIDEO_STATE_DATE_OFF   |       \
-                                VIDEO_STATE_TIME_OFF)
-#define VIDEO_PRESS_OFF                (VIDEO_PRESS_PLAY_OFF   |       \
-                                VIDEO_PRESS_REC_OFF    |       \
-                                VIDEO_PRESS_PAUSE_OFF  |       \
-                                VIDEO_PRESS_STOP_OFF   |       \
-                                VIDEO_PRESS_EJECT_OFF)
-#define VIDEO_ALL_OFF          (VIDEO_STATE_OFF | VIDEO_PRESS_OFF)
-
-#define VIDEO_STATE_ON         (VIDEO_STATE_PLAY_ON    |       \
-                                VIDEO_STATE_REC_ON     |       \
-                                VIDEO_STATE_PAUSE_ON   |       \
-                                VIDEO_STATE_FFWD_ON    |       \
-                                VIDEO_STATE_PBEND_ON   |       \
-                                VIDEO_STATE_DATE_ON    |       \
-                                VIDEO_STATE_TIME_ON)
-#define VIDEO_PRESS_ON         (VIDEO_PRESS_PLAY_ON    |       \
-                                VIDEO_PRESS_REC_ON     |       \
-                                VIDEO_PRESS_PAUSE_ON   |       \
-                                VIDEO_PRESS_STOP_ON    |       \
-                                VIDEO_PRESS_EJECT_ON)
-#define VIDEO_ALL_ON           (VIDEO_STATE_ON | VIDEO_PRESS_ON)
-
-#define VIDEO_STATE            (VIDEO_STATE_ON | VIDEO_STATE_OFF)
-#define VIDEO_PRESS            (VIDEO_PRESS_ON | VIDEO_PRESS_OFF)
-#define VIDEO_ALL              (VIDEO_ALL_ON | VIDEO_ALL_OFF)
+#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)
+#define VIDEO_STATE_OFF                        (VIDEO_STATE_PLAY_OFF   |       \
+                                        VIDEO_STATE_REC_OFF    |       \
+                                        VIDEO_STATE_PAUSE_OFF  |       \
+                                        VIDEO_STATE_FFWD_OFF   |       \
+                                        VIDEO_STATE_PBEND_OFF  |       \
+                                        VIDEO_STATE_1STEP_OFF)
+#define VIDEO_PRESS_OFF                        (VIDEO_PRESS_PLAY_OFF   |       \
+                                        VIDEO_PRESS_REC_OFF    |       \
+                                        VIDEO_PRESS_PAUSE_OFF  |       \
+                                        VIDEO_PRESS_STOP_OFF   |       \
+                                        VIDEO_PRESS_EJECT_OFF)
+#define VIDEO_ALL_OFF                  (VIDEO_INFO_OFF         |       \
+                                        VIDEO_STATE_OFF        |       \
+                                        VIDEO_PRESS_OFF)
+
+#define VIDEO_INFO_ON                  (VIDEO_STATE_DATE_ON    |       \
+                                        VIDEO_STATE_TIME_ON)
+#define VIDEO_STATE_ON                 (VIDEO_STATE_PLAY_ON    |       \
+                                        VIDEO_STATE_REC_ON     |       \
+                                        VIDEO_STATE_PAUSE_ON   |       \
+                                        VIDEO_STATE_FFWD_ON    |       \
+                                        VIDEO_STATE_PBEND_ON   |       \
+                                        VIDEO_STATE_1STEP_ON)
+#define VIDEO_PRESS_ON                 (VIDEO_PRESS_PLAY_ON    |       \
+                                        VIDEO_PRESS_REC_ON     |       \
+                                        VIDEO_PRESS_PAUSE_ON   |       \
+                                        VIDEO_PRESS_STOP_ON    |       \
+                                        VIDEO_PRESS_EJECT_ON)
+#define VIDEO_ALL_ON                   (VIDEO_INFO_ON          |       \
+                                        VIDEO_STATE_ON         |       \
+                                        VIDEO_PRESS_ON)
+
+#define VIDEO_INFO                     (VIDEO_INFO_ON | VIDEO_INFO_OFF)
+#define VIDEO_STATE                    (VIDEO_STATE_ON | VIDEO_STATE_OFF)
+#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_FUNCTION_PARTS                2
+#define NUM_TAPE_FUNCTION_STATES       2
 
 
 /* ========================================================================= */
 /* video display functions                                                   */
 /* ========================================================================= */
 
-void DrawVideoDisplay(unsigned long state, unsigned long value)
+void DrawVideoDisplay(unsigned int state, unsigned int value)
 {
-  int i;
-  int part_label = 0, part_symbol = 1;
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
+  int i, j, k;
   static char *monatsname[12] =
   {
     "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
     "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
   };
-  static int video_pos[5][2][4] =
+
+#if 0
+  static struct
   {
-    {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
-       VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
-     { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
-       VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
-
-    {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
-       VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
-     { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
-       VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
-
-    {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
-       VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
-     { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
-       VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
-
-    {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
-       VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
-     { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
-       VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
-
-    {{ 0,0,
-       0,0 },
-     { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
-       VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }}
+    int gd_x1, gd_y1;
+    int gd_x2, gd_y2;
+    int x, y;
+    int width, height;
+  }
+  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
+      }
+    },
   };
+#endif
 
-  if (state & VIDEO_STATE_PBEND_OFF)
+#if 1
+  static struct
   {
-    int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
-
-    BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-              cx + VIDEO_REC_LABEL_XPOS,
-              cy + VIDEO_REC_LABEL_YPOS,
-              VIDEO_PBEND_LABEL_XSIZE,
-              VIDEO_PBEND_LABEL_YSIZE,
-              VX + VIDEO_REC_LABEL_XPOS,
-              VY + VIDEO_REC_LABEL_YPOS);
+    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_TAPE_LABEL_GFX_RECORD,             &tape.label.record      },
+      { IMG_TAPE_SYMBOL_GFX_RECORD,            &tape.symbol.record     },
+    },
+    {
+      { IMG_TAPE_LABEL_GFX_PAUSE,              &tape.label.pause       },
+      { IMG_TAPE_SYMBOL_GFX_PAUSE,             &tape.symbol.pause      },
+    },
+    {
+      { IMG_TAPE_LABEL_GFX_DATE,               &tape.label.date        },
+      { -1,                                    NULL                    },
+    },
+    {
+      { IMG_TAPE_LABEL_GFX_TIME,               &tape.label.time        },
+      { -1,                                    NULL                    },
+    },
+    {
+      { IMG_TAPE_LABEL_GFX_FAST_FORWARD,       &tape.label.fast_forward  },
+      { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD,      &tape.symbol.fast_forward },
+    },
+    {
+      { 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_TAPE_LABEL_GFX_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind},
+      { IMG_TAPE_SYMBOL_GFX_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_TAPE_LABEL_GFX_SINGLE_STEP,                &tape.label.single_step  },
+      { IMG_TAPE_SYMBOL_GFX_SINGLE_STEP,       &tape.symbol.single_step },
+    },
+  };
 
-  for(i=0;i<10;i++)
+  for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++)       /* on or off states */
   {
-    if (state & (1<<i))
+    for (i = 0; i < NUM_TAPE_FUNCTIONS; i++)           /* record, play, ... */
     {
-      int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
+      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)
+         continue;
 
-      if (i%2)                 /* i ungerade => STATE_ON / PRESS_OFF */
-       cx = DOOR_GFX_PAGEX4;
-      else
-       cx = DOOR_GFX_PAGEX3;   /* i gerade => STATE_OFF / PRESS_ON */
-
-      if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
-       BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-                  cx + video_pos[pos][part_label][xpos],
-                  cy + video_pos[pos][part_label][ypos],
-                  video_pos[pos][part_label][xsize],
-                  video_pos[pos][part_label][ysize],
-                  VX + video_pos[pos][part_label][xpos],
-                  VY + video_pos[pos][part_label][ypos]);
-      if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
-       BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-                  cx + video_pos[pos][part_symbol][xpos],
-                  cy + video_pos[pos][part_symbol][ypos],
-                  video_pos[pos][part_symbol][xsize],
-                  video_pos[pos][part_symbol][ysize],
-                  VX + video_pos[pos][part_symbol][xpos],
-                  VY + video_pos[pos][part_symbol][ypos]);
+       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;
+         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_bitmap = gfx->bitmap;
+           gd_x = gfx->src_x;
+           gd_y = gfx->src_y;
+         }
+         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 */
+         if (gd_bitmap != NULL)
+           BlitBitmap(gd_bitmap, drawto, gd_x, gd_y, gfx->width, gfx->height,
+                      VX + pos->x, VY + pos->y);
+       }
+      }
     }
   }
 
-  if (state & VIDEO_STATE_FFWD_ON)
+#else
+
+  for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++)       /* on or off states */
   {
-    int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
-
-    BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-              cx + VIDEO_PLAY_SYMBOL_XPOS,
-              cy + VIDEO_PLAY_SYMBOL_YPOS,
-              VIDEO_PLAY_SYMBOL_XSIZE - 2,
-              VIDEO_PLAY_SYMBOL_YSIZE,
-              VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
-              VY + VIDEO_PLAY_SYMBOL_YPOS);
+    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);
+
+         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;
+         }
+
+         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
 
-  if (state & VIDEO_STATE_PBEND_ON)
+#if 1
+  if (state & VIDEO_STATE_DATE_ON)
   {
-    int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-
-    BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-              cx + VIDEO_PBEND_LABEL_XPOS,
-              cy + VIDEO_PBEND_LABEL_YPOS,
-              VIDEO_PBEND_LABEL_XSIZE,
-              VIDEO_PBEND_LABEL_YSIZE,
-              VX + VIDEO_REC_LABEL_XPOS,
-              VY + VIDEO_REC_LABEL_YPOS);
+    struct TextPosInfo *pos = &tape.text.date;
+    int tag = value % 100;
+    int monat = (value/100) % 100;
+    int jahr = (value/10000);
+
+    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);
+  }
+
+  if (state & VIDEO_STATE_TIME_ON)
+  {
+    struct TextPosInfo *pos = &tape.text.time;
+    int min = value / 60;
+    int sec = value % 60;
+
+    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);
   }
 
+#else
+
   if (state & VIDEO_STATE_DATE_ON)
   {
     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),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
-            monatsname[monat],FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
-            int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
+    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);
   }
 
   if (state & VIDEO_STATE_TIME_ON)
@@ -252,22 +524,70 @@ void DrawVideoDisplay(unsigned long state, unsigned long value)
     int min = value / 60;
     int sec = value % 60;
 
-    DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
-            int2str(min,2),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
-            int2str(sec,2),FS_SMALL,FC_SPECIAL1);
+    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 (state & VIDEO_STATE_DATE)
-    redraw_mask |= REDRAW_VIDEO_1;
-  if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
-    redraw_mask |= REDRAW_VIDEO_2;
-  if (state & VIDEO_PRESS)
-    redraw_mask |= REDRAW_VIDEO_3;
+  redraw_mask |= REDRAW_DOOR_2;
 }
 
 void DrawCompleteVideoDisplay()
 {
+#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
+
+#if 1
+
+  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);
+
+  /* draw tape buttons (forced) */
+  UnmapTapeButtons();
+  MapTapeButtons();
+
+#else
+
+#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[] =
+  {
+    &tape.button.eject,
+    &tape.button.stop,
+    &tape.button.pause,
+    &tape.button.record,
+    &tape.button.play
+  };
+  int i;
+
+  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++)
+  {
+    struct GraphicInfo *g = &graphic_info[tape_button_graphics[i]];
+    struct Rect *pos = tape_button_positions[i];
+
+    BlitBitmap(g->bitmap, drawto, g->src_x, g->src_y,
+              g->width, g->height, gfx.vx + pos->x, gfx.vy + pos->y);
+  }
+#else
   BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
             DOOR_GFX_PAGEX3, DOOR_GFX_PAGEY2,
             gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy);
@@ -276,16 +596,69 @@ void DrawCompleteVideoDisplay()
             DOOR_GFX_PAGEY2 + VIDEO_CONTROL_YPOS,
             VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE,
             gfx.vx + VIDEO_CONTROL_XPOS, gfx.vy + VIDEO_CONTROL_YPOS);
+#endif
+
+#endif
 
   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);
+
+    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);
+
+    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);
+  }
+#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()
+{
+  SetDrawDeactivationMask(REDRAW_FIELD);
+  audio.sound_deactivated = TRUE;
+}
+
+void TapeDeactivateDisplayOff(boolean redraw_display)
+{
+  SetDrawDeactivationMask(REDRAW_NONE);
+  audio.sound_deactivated = FALSE;
+
+  if (redraw_display)
+  {
+    RedrawPlayfield(TRUE, 0,0,0,0);
+    DrawGameDoorValues();
+  }
 }
 
 
@@ -293,28 +666,46 @@ void DrawCompleteVideoDisplay()
 /* tape control functions                                                    */
 /* ========================================================================= */
 
+void TapeSetDateFromEpochSeconds(time_t epoch_seconds)
+{
+  struct tm *lt = localtime(&epoch_seconds);
+
+  tape.date = 10000 * (lt->tm_year % 100) + 100 * lt->tm_mon + lt->tm_mday;
+}
+
+void TapeSetDateFromNow()
+{
+  TapeSetDateFromEpochSeconds(time(NULL));
+}
+
 void TapeErase()
 {
-  time_t epoch_seconds = time(NULL);
-  struct tm *time = localtime(&epoch_seconds);
   int i;
 
-  tape.length = 0;
   tape.counter = 0;
+  tape.length = 0;
+  tape.length_seconds = 0;
+
+  if (leveldir_current)
+    setString(&tape.level_identifier, leveldir_current->identifier);
 
   tape.level_nr = level_nr;
   tape.pos[tape.counter].delay = 0;
   tape.changed = TRUE;
 
-  tape.date = 10000*(time->tm_year % 100) + 100*time->tm_mon + time->tm_mday;
-  tape.random_seed = InitRND(NEW_RANDOMIZE);
+  tape.random_seed = InitRND(level.random_seed);
 
   tape.file_version = FILE_VERSION_ACTUAL;
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 
-  for(i=0; i<MAX_PLAYERS; i++)
+  TapeSetDateFromNow();
+
+  for (i = 0; i < MAX_PLAYERS; i++)
     tape.player_participates[i] = FALSE;
+
+  tape.centered_player_nr_next = -1;
+  tape.set_centered_player = FALSE;
 }
 
 static void TapeRewind()
@@ -325,29 +716,40 @@ static void TapeRewind()
   tape.recording = FALSE;
   tape.playing = FALSE;
   tape.fast_forward = FALSE;
-  tape.index_search = FALSE;
+  tape.warp_forward = FALSE;
+  tape.deactivate_display = FALSE;
   tape.auto_play = (global.autoplay_leveldir != NULL);
   tape.auto_play_level_solved = FALSE;
   tape.quick_resume = FALSE;
   tape.single_step = FALSE;
 
+  tape.centered_player_nr_next = -1;
+  tape.set_centered_player = FALSE;
+
   InitRND(tape.random_seed);
 }
 
-void TapeStartRecording()
+static void TapeSetRandomSeed(int random_seed)
+{
+  tape.random_seed = InitRND(random_seed);
+}
+
+void TapeStartRecording(int random_seed)
 {
   if (!TAPE_IS_STOPPED(tape))
     TapeStop();
 
   TapeErase();
   TapeRewind();
+  TapeSetRandomSeed(random_seed);
 
   tape.recording = TRUE;
 
   DrawVideoDisplay(VIDEO_STATE_REC_ON, 0);
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
-  MapTapeIndexButton();
+
+  MapTapeWarpButton();
 
   SetDrawDeactivationMask(REDRAW_NONE);
   audio.sound_deactivated = FALSE;
@@ -355,18 +757,18 @@ void TapeStartRecording()
 
 static void TapeStartGameRecording()
 {
-  TapeStartRecording();
+  TapeStartRecording(level.random_seed);
 
-#if defined(PLATFORM_UNIX)
+#if defined(NETWORK_AVALIABLE)
   if (options.network)
-    SendToServer_StartPlaying();
-  else
-#endif
   {
-    game_status = PLAYING;
-    StopAnimation();
-    InitGame();
+    SendToServer_StartPlaying();
+
+    return;
   }
+#endif
+
+  InitGame();
 }
 
 static void TapeAppendRecording()
@@ -379,7 +781,14 @@ static void TapeAppendRecording()
   tape.recording = TRUE;
   tape.changed = TRUE;
 
-  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
+  TapeSetDateFromNow();
+
+  DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
+  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0);
+
+#if 1
+  UpdateAndDisplayGameControlValues();
+#endif
 }
 
 void TapeHaltRecording()
@@ -396,9 +805,6 @@ void TapeHaltRecording()
 
 void TapeStopRecording()
 {
-  if (!tape.recording)
-    return;
-
   TapeHaltRecording();
 
   tape.recording = FALSE;
@@ -408,24 +814,38 @@ void TapeStopRecording()
   MapTapeEjectButton();
 }
 
-void TapeRecordAction(byte action[MAX_PLAYERS])
+void TapeRecordAction(byte action_raw[MAX_PLAYERS])
 {
+  byte action[MAX_PLAYERS];
   int i;
 
-  if (!tape.recording || tape.pausing)
+  if (!tape.recording)         /* (record action even when tape is paused) */
     return;
 
-  if (tape.counter >= MAX_TAPELEN - 1)
+  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 */
   {
     boolean changed_events = FALSE;
 
-    for(i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
       if (tape.pos[tape.counter].action[i] != action[i])
        changed_events = TRUE;
 
@@ -440,7 +860,7 @@ void TapeRecordAction(byte action[MAX_PLAYERS])
 
   if (tape.pos[tape.counter].delay == 0)       /* store new action */
   {
-    for(i=0; i<MAX_PLAYERS; i++)
+    for (i = 0; i < MAX_PLAYERS; i++)
       tape.pos[tape.counter].action[i] = action[i];
 
     tape.pos[tape.counter].delay++;
@@ -449,12 +869,12 @@ void TapeRecordAction(byte action[MAX_PLAYERS])
 
 void TapeTogglePause(boolean toggle_manual)
 {
-  unsigned long state;
+  int state = 0;
 
-#if 0
-  if (!tape.recording && !tape.playing)
-    return;
-#endif
+  if (tape.pause_before_death)
+    state |= VIDEO_STATE_PBEND_OFF;
+  else if (tape.fast_forward)
+    state |= VIDEO_STATE_FFWD_OFF;
 
   tape.pausing = !tape.pausing;
   tape.fast_forward = FALSE;
@@ -463,22 +883,26 @@ void TapeTogglePause(boolean toggle_manual)
   if (tape.single_step && toggle_manual)
     tape.single_step = FALSE;
 
-  state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
+  state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
   if (tape.playing)
-    state |= VIDEO_STATE_PBEND_OFF;
+    state |= VIDEO_STATE_PLAY_ON;
+  else
+    state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF);
 
   DrawVideoDisplay(state, 0);
 
-  if (tape.index_search)
+  if (tape.warp_forward)
   {
-    TapeStopIndexSearch();
+    TapeStopWarpForward();
 
     if (tape.quick_resume)
     {
       tape.quick_resume = FALSE;
 
       TapeAppendRecording();
-      TapeTogglePause(toggle_manual);
+
+      if (!CheckEngineSnapshot())
+       SaveEngineSnapshot();
     }
   }
 }
@@ -498,7 +922,8 @@ void TapeStartPlaying()
   DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0);
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
-  MapTapeIndexButton();
+
+  MapTapeWarpButton();
 
   SetDrawDeactivationMask(REDRAW_NONE);
   audio.sound_deactivated = FALSE;
@@ -508,21 +933,16 @@ static void TapeStartGamePlaying()
 {
   TapeStartPlaying();
 
-  game_status = PLAYING;
-  StopAnimation();
   InitGame();
 }
 
 void TapeStopPlaying()
 {
-  if (!tape.playing)
-    return;
-
   tape.playing = FALSE;
   tape.pausing = FALSE;
 
-  if (tape.index_search)
-    TapeStopIndexSearch();
+  if (tape.warp_forward)
+    TapeStopWarpForward();
 
   DrawVideoDisplay(VIDEO_STATE_PLAY_OFF, 0);
   MapTapeEjectButton();
@@ -536,7 +956,7 @@ byte *TapePlayAction()
   if (!tape.playing || tape.pausing)
     return NULL;
 
-  if (tape.pause_before_death) /* STOP 10s BEFORE PLAYER GETS KILLED... */
+  if (tape.pause_before_death) /* stop 10 seconds before player gets killed */
   {
     if (!(FrameCounter % 20))
     {
@@ -546,16 +966,53 @@ byte *TapePlayAction()
        DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
     }
 
-    if (TimePlayed > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+    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)
     {
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
       return NULL;
     }
   }
+  else if (tape.fast_forward)
+  {
+    if ((FrameCounter / 20) % 2)
+      DrawVideoDisplay(VIDEO_STATE_FFWD_ON, VIDEO_DISPLAY_LABEL_ONLY);
+    else
+      DrawVideoDisplay(VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+
+    if (tape.warp_forward)
+    {
+      if (tape.deactivate_display)
+       DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+      else
+       DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+    }
+  }
+
+#if 0
+  /* !!! this makes things much slower !!! */
+  else if (tape.warp_forward)
+  {
+    if ((FrameCounter / 20) % 2)
+      DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_LABEL_ONLY);
+    else
+      DrawVideoDisplay(VIDEO_STATE_WARP_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+
+    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+  }
+#endif
 
   if (tape.counter >= tape.length)     /* end of tape reached */
   {
-    if (tape.index_search && !tape.auto_play)
+    if (tape.warp_forward && !tape.auto_play)
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
     else
       TapeStop();
@@ -563,9 +1020,24 @@ byte *TapePlayAction()
     return NULL;
   }
 
-  for(i=0; i<MAX_PLAYERS; i++)
+  for (i = 0; i < MAX_PLAYERS; i++)
     action[i] = tape.pos[tape.counter].action[i];
 
+  tape.set_centered_player = FALSE;
+  tape.centered_player_nr_next = -999;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    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;
+  }
+
   tape.delay_played++;
   if (tape.delay_played >= tape.pos[tape.counter].delay)
   {
@@ -581,15 +1053,13 @@ void TapeStop()
   TapeStopRecording();
   TapeStopPlaying();
 
-  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
+  DrawVideoDisplay(VIDEO_STATE_OFF, 0);
+
   if (tape.date && tape.length)
   {
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
   }
-
-  if (tape.auto_play)
-    AutoPlayTape();    /* continue automatically playing next tape */
 }
 
 unsigned int GetTapeLength()
@@ -600,34 +1070,47 @@ unsigned int GetTapeLength()
   if (TAPE_IS_EMPTY(tape))
     return(0);
 
-  for(i=0;i<tape.length;i++)
+  for (i = 0; i < tape.length; i++)
     tape_length += tape.pos[i].delay;
 
   return(tape_length * GAME_FRAME_DELAY / 1000);
 }
 
-static void TapeStartIndexSearch()
+static void TapeStartWarpForward()
 {
-  tape.index_search = TRUE;
+  tape.warp_forward = TRUE;
 
-  if (!tape.fast_forward || tape.pause_before_death)
+  if (!tape.fast_forward && !tape.pause_before_death)
   {
     tape.pausing = FALSE;
+    tape.deactivate_display = TRUE;
 
-    SetDrawDeactivationMask(REDRAW_FIELD);
-    audio.sound_deactivated = TRUE;
+    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);
 }
 
-static void TapeStopIndexSearch()
+static void TapeStopWarpForward()
 {
-  tape.index_search = FALSE;
+  int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
 
-  SetDrawDeactivationMask(REDRAW_NONE);
-  audio.sound_deactivated = FALSE;
+  tape.warp_forward = FALSE;
+  tape.deactivate_display = FALSE;
+
+  TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
 
-  RedrawPlayfield(TRUE, 0,0,0,0);
-  DrawGameDoorValues();
+  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;
+
+  DrawVideoDisplay(state, 0);
 }
 
 static void TapeSingleStep()
@@ -639,42 +1122,116 @@ static void TapeSingleStep()
     TapeTogglePause(TAPE_TOGGLE_MANUAL);
 
   tape.single_step = !tape.single_step;
+
+  DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON :
+                   VIDEO_STATE_1STEP_OFF), 0);
 }
 
 void TapeQuickSave()
 {
-  if (game_status == PLAYING)
+  if (game_status == GAME_MODE_MAIN)
   {
-    if (tape.recording)
-      TapeHaltRecording();     /* prepare tape for saving on-the-fly */
+    Request("No game that can be saved!", REQ_CONFIRM);
 
-    if (TAPE_IS_EMPTY(tape))
-      Request("No tape that can be saved !", REQ_CONFIRM);
-    else
-      SaveTape(tape.level_nr);
+    return;
+  }
+
+  if (game_status != GAME_MODE_PLAYING)
+    return;
+
+  if (tape.recording)
+    TapeHaltRecording();       /* prepare tape for saving on-the-fly */
+
+  if (TAPE_IS_EMPTY(tape))
+  {
+    Request("No tape that can be saved!", REQ_CONFIRM);
+
+    return;
   }
-  else if (game_status == MAINMENU)
-    Request("No game that can be saved !", REQ_CONFIRM);
+
+  if (SaveTapeChecked(tape.level_nr))
+    SaveEngineSnapshot();
 }
 
 void TapeQuickLoad()
 {
-  if (game_status == PLAYING || game_status == MAINMENU)
+  char *filename = getTapeFilename(level_nr);
+
+  if (!fileExists(filename))
   {
-    TapeStop();
-    TapeErase();
+    Request("No tape for this level!", REQ_CONFIRM);
 
-    LoadTape(level_nr);
-    if (!TAPE_IS_EMPTY(tape))
-    {
-      TapeStartGamePlaying();
-      TapeStartIndexSearch();
+    return;
+  }
 
-      tape.quick_resume = TRUE;
-    }
-    else
-      Request("No tape for this level !", REQ_CONFIRM);
+  if (tape.recording && !Request("Stop recording and load tape?",
+                                REQ_ASK | REQ_STAY_CLOSED))
+  {
+    OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+
+    return;
+  }
+
+  if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
+    return;
+
+  if (CheckEngineSnapshot())
+  {
+#if 0
+    printf("::: MARK 1\n");
+#endif
+
+    TapeStartGamePlaying();
+
+    LoadEngineSnapshot();
+
+    DrawCompleteVideoDisplay();
+
+    tape.playing = TRUE;
+    tape.pausing = TRUE;
+
+    TapeStopWarpForward();
+    TapeAppendRecording();
+
+    if (FrameCounter > 0)
+      return;
   }
+
+#if 0
+  printf("::: MARK 2\n");
+#endif
+
+  TapeStop();
+  TapeErase();
+
+  LoadTape(level_nr);
+
+  if (!TAPE_IS_EMPTY(tape))
+  {
+    TapeStartGamePlaying();
+    TapeStartWarpForward();
+
+    tape.quick_resume = TRUE;
+  }
+  else /* this should not happen (basically checked above) */
+  {
+    int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
+
+    Request("No tape for this level!", REQ_CONFIRM | reopen_door);
+  }
+}
+
+void InsertSolutionTape()
+{
+  if (!TAPE_IS_EMPTY(tape))
+    return;
+
+  LoadSolutionTape(level_nr);
+
+  if (TAPE_IS_EMPTY(tape))
+    Request("No solution tape for this level!", REQ_CONFIRM);
+
+  DrawCompleteVideoDisplay();
 }
 
 
@@ -682,8 +1239,6 @@ void TapeQuickLoad()
  * tape autoplay functions
  * ------------------------------------------------------------------------- */
 
-#define MAX_NUM_AUTOPLAY_LEVELS                1000
-
 void AutoPlayTape()
 {
   static LevelDirTree *autoplay_leveldir = NULL;
@@ -691,7 +1246,11 @@ void AutoPlayTape()
   static int autoplay_level_nr = -1;
   static int num_levels_played = 0;
   static int num_levels_solved = 0;
-  static boolean levels_failed[MAX_NUM_AUTOPLAY_LEVELS];
+  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
   int i;
 
   if (autoplay_initialized)
@@ -700,10 +1259,11 @@ void AutoPlayTape()
     printf("%s.\n", tape.auto_play_level_solved ? "solved" : "NOT SOLVED");
 
     num_levels_played++;
+
     if (tape.auto_play_level_solved)
       num_levels_solved++;
-    else if (level_nr >= 0 && level_nr < MAX_NUM_AUTOPLAY_LEVELS)
-      levels_failed[level_nr] = TRUE;
+    else if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
+      level_failed[level_nr] = TRUE;
   }
   else
   {
@@ -719,26 +1279,30 @@ void AutoPlayTape()
 
     leveldir_current = autoplay_leveldir;
 
-    if (global.autoplay_level_nr != -1)
-    {
-      autoplay_leveldir->first_level = global.autoplay_level_nr;
-      autoplay_leveldir->last_level  = global.autoplay_level_nr;
-    }
+    if (autoplay_leveldir->first_level < 0)
+      autoplay_leveldir->first_level = 0;
+    if (autoplay_leveldir->last_level >= MAX_TAPES_PER_SET)
+      autoplay_leveldir->last_level = MAX_TAPES_PER_SET - 1;
 
     autoplay_level_nr = autoplay_leveldir->first_level;
 
-    printf_line('=', 79);
+    printf_line("=", 79);
     printf("Automatically playing level tapes\n");
-    printf_line('-', 79);
+    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_line("=", 79);
     printf("\n");
 
-    for (i=0; i<MAX_NUM_AUTOPLAY_LEVELS; i++)
-      levels_failed[i] = FALSE;
+    for (i = 0; i < MAX_TAPES_PER_SET; i++)
+    {
+      level_failed[i] = FALSE;
+#if 0
+      tape_missing[i] = FALSE;
+#endif
+    }
 
     autoplay_initialized = TRUE;
   }
@@ -747,20 +1311,36 @@ void AutoPlayTape()
   {
     level_nr = autoplay_level_nr++;
 
+    if (!global.autoplay_all && !global.autoplay_level[level_nr])
+      continue;
+
     TapeErase();
 
     printf("Level %03d: ", level_nr);
 
     LoadLevel(level_nr);
-    if (level.no_level_file)
+    if (level.no_valid_file)
     {
       printf("(no level)\n");
       continue;
     }
 
-    LoadTape(level_nr);
-    if (TAPE_IS_EMPTY(tape))
+#if 0
+    /* ACTIVATE THIS FOR LOADING/TESTING OF LEVELS ONLY */
+    printf("(only testing level)\n");
+    continue;
+#endif
+
+    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");
       continue;
     }
@@ -768,30 +1348,42 @@ void AutoPlayTape()
     printf("playing tape ... ");
 
     TapeStartGamePlaying();
-    TapeStartIndexSearch();
+    TapeStartWarpForward();
 
     return;
   }
 
   printf("\n");
-  printf_line('=', 79);
+  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_solved * 100 / num_levels_played);
-  printf_line('-', 79);
+        (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_solved * 100 / num_levels_played);
+        (num_levels_played ? num_levels_solved * 100 / num_levels_played :0));
+
   if (num_levels_played != num_levels_solved)
   {
     printf(", FAILED:");
-    for (i=0; i<MAX_NUM_AUTOPLAY_LEVELS; i++)
-      if (levels_failed[i])
+    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);
   }
+#endif
+
   printf("\n");
-  printf_line('=', 79);
+  printf_line("=", 79);
 
   CloseAllAndExit(0);
 }
@@ -799,55 +1391,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_INDEX_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 Rect *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_TAPE_BUTTON_GFX_EJECT,         &tape.button.eject,
+    TAPE_CTRL_ID_EJECT,                        "eject tape"
   },
   {
-    TAPE_BUTTON_INDEX_XPOS,    TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_INDEX,
-    "index mark"
+    /* (same position as "eject" button) */
+    IMG_TAPE_BUTTON_GFX_EXTRA,         &tape.button.eject,
+    TAPE_CTRL_ID_EXTRA,                        "extra functions"
   },
   {
-    TAPE_BUTTON_STOP_XPOS,     TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_STOP,
-    "stop tape"
+    IMG_TAPE_BUTTON_GFX_STOP,          &tape.button.stop,
+    TAPE_CTRL_ID_STOP,                 "stop tape"
   },
   {
-    TAPE_BUTTON_PAUSE_XPOS,    TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_PAUSE,
-    "pause tape"
+    IMG_TAPE_BUTTON_GFX_PAUSE,         &tape.button.pause,
+    TAPE_CTRL_ID_PAUSE,                        "pause tape"
   },
   {
-    TAPE_BUTTON_RECORD_XPOS,   TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_RECORD,
-    "record tape"
+    IMG_TAPE_BUTTON_GFX_RECORD,                &tape.button.record,
+    TAPE_CTRL_ID_RECORD,               "record tape"
   },
   {
-    TAPE_BUTTON_PLAY_XPOS,     TAPE_BUTTON_YPOS,
-    TAPE_CTRL_ID_PLAY,
-    "play tape"
+    IMG_TAPE_BUTTON_GFX_PLAY,          &tape.button.play,
+    TAPE_CTRL_ID_PLAY,                 "play tape"
   }
 };
 
@@ -855,36 +1430,28 @@ void CreateTapeButtons()
 {
   int i;
 
-  for (i=0; i<NUM_TAPE_BUTTONS; i++)
+  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 Rect *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_INDEX)
-    {
-      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,
                      GDI_END);
@@ -900,73 +1467,88 @@ void FreeTapeButtons()
 {
   int i;
 
-  for (i=0; i<NUM_TAPE_BUTTONS; i++)
+  for (i = 0; i < NUM_TAPE_BUTTONS; i++)
     FreeGadget(tape_gadget[i]);
 }
 
 void MapTapeEjectButton()
 {
-  UnmapGadget(tape_gadget[TAPE_CTRL_ID_INDEX]);
+  UnmapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]);
   MapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]);
 }
 
-void MapTapeIndexButton()
+void MapTapeWarpButton()
 {
   UnmapGadget(tape_gadget[TAPE_CTRL_ID_EJECT]);
-  MapGadget(tape_gadget[TAPE_CTRL_ID_INDEX]);
+  MapGadget(tape_gadget[TAPE_CTRL_ID_EXTRA]);
 }
 
 void MapTapeButtons()
 {
   int i;
 
-  for (i=0; i<NUM_TAPE_BUTTONS; i++)
-    if (i != TAPE_CTRL_ID_INDEX)
+  for (i = 0; i < NUM_TAPE_BUTTONS; i++)
+    if (i != TAPE_CTRL_ID_EXTRA)
       MapGadget(tape_gadget[i]);
 
   if (tape.recording || tape.playing)
-    MapTapeIndexButton();
+    MapTapeWarpButton();
+
+  if (tape.show_game_buttons)
+    MapGameButtons();
 }
 
 void UnmapTapeButtons()
 {
   int i;
 
-  for (i=0; i<NUM_TAPE_BUTTONS; i++)
+  for (i = 0; i < NUM_TAPE_BUTTONS; i++)
     UnmapGadget(tape_gadget[i]);
 }
 
-static void HandleTapeButtons(struct GadgetInfo *gi)
+static void HandleTapeButtonsExt(int id)
 {
-  int id = gi->custom_id;
-
-  if (game_status != MAINMENU && game_status != PLAYING)
+  if (game_status != GAME_MODE_MAIN && game_status != GAME_MODE_PLAYING)
     return;
 
   switch (id)
   {
     case TAPE_CTRL_ID_EJECT:
       TapeStop();
+
       if (TAPE_IS_EMPTY(tape))
       {
        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
       {
        if (tape.changed)
-         SaveTape(tape.level_nr);
+         SaveTapeChecked(tape.level_nr);
+
        TapeErase();
       }
+
       DrawCompleteVideoDisplay();
       break;
 
-    case TAPE_CTRL_ID_INDEX:
+    case TAPE_CTRL_ID_EXTRA:
       if (tape.playing)
-       TapeStartIndexSearch();
+      {
+       if (!tape.warp_forward)                 /* PLAY -> WARP FORWARD PLAY */
+       {
+         TapeStartWarpForward();
+       }
+       else                                    /* WARP FORWARD PLAY -> PLAY */
+       {
+         TapeStopWarpForward();
+       }
+      }
       else if (tape.recording)
        TapeSingleStep();
+
       break;
 
     case TAPE_CTRL_ID_STOP:
@@ -982,7 +1564,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
        TapeStartGameRecording();
       else if (tape.pausing)
       {
-       if (tape.playing)       /* PLAYING -> PAUSING -> RECORDING */
+       if (tape.playing)                       /* PLAY -> PAUSE -> RECORD */
          TapeAppendRecording();
        else
          TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@ -1011,13 +1593,17 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
        else if (!tape.pause_before_death)      /* FFWD PLAY -> AUTO PAUSE */
        {
          tape.pause_before_death = TRUE;
-         DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
+         DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
        }
        else                                    /* AUTO PAUSE -> NORMAL PLAY */
        {
+         if (tape.warp_forward)
+           TapeStopWarpForward();
+
          tape.fast_forward = FALSE;
          tape.pause_before_death = FALSE;
-         DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0);
+
+         DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
        }
       }
       break;
@@ -1026,3 +1612,27 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
       break;
   }
 }
+
+static void HandleTapeButtons(struct GadgetInfo *gi)
+{
+  HandleTapeButtonsExt(gi->custom_id);
+}
+
+void HandleTapeButtonKeys(Key key)
+{
+  boolean eject_button_is_active = TAPE_IS_STOPPED(tape);
+  boolean extra_button_is_active = !eject_button_is_active;
+
+  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)
+    HandleTapeButtonsExt(TAPE_CTRL_ID_PAUSE);
+  else if (key == setup.shortcut.tape_record)
+    HandleTapeButtonsExt(TAPE_CTRL_ID_RECORD);
+  else if (key == setup.shortcut.tape_play)
+    HandleTapeButtonsExt(TAPE_CTRL_ID_PLAY);
+}