X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=ff6d10f250c8e48d6e440b0bbbb3eb9690944f9e;hp=c10edefc986db553da8af9b5812452910c84f29c;hb=e9a2029050b7d36830d3a6c7e1b21831ba0d2b42;hpb=f2ddf39ad776c01f9b8a57818fe3ea9777649778

diff --git a/src/tape.c b/src/tape.c
index c10edefc..ff6d10f2 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -17,7 +17,7 @@
 #include "tools.h"
 #include "files.h"
 #include "network.h"
-#include "cartoons.h"
+#include "anim.h"
 
 #define DEBUG_TAPE_WHEN_PLAYING			FALSE
 
@@ -45,99 +45,6 @@ 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_FRAME_OFF)
@@ -145,6 +52,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 					 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	|	\
@@ -163,6 +72,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 					 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	|	\
@@ -229,16 +140,16 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value)
       { IMG_GFX_TAPE_SYMBOL_FAST_FORWARD,	&tape.symbol.fast_forward },
     },
     {
-      { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END,	&tape.label.pause_before_end  },
-      { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END,	&tape.symbol.pause_before_end },
+      { IMG_GFX_TAPE_LABEL_WARP_FORWARD,	&tape.label.warp_forward  },
+      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD,	&tape.symbol.warp_forward },
     },
     {
       { IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND,	&tape.label.warp_forward_blind},
       { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind},
     },
     {
-      { IMG_GFX_TAPE_LABEL_WARP_FORWARD,	&tape.label.warp_forward  },
-      { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD,	&tape.symbol.warp_forward },
+      { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END,	&tape.label.pause_before_end  },
+      { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END,	&tape.symbol.pause_before_end },
     },
     {
       { IMG_GFX_TAPE_LABEL_SINGLE_STEP,		&tape.label.single_step	 },
@@ -435,6 +346,46 @@ void DrawVideoDisplay(unsigned int state, unsigned int 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 DrawVideoDisplayPlayState()
+{
+  int state = 0;
+
+  DrawVideoDisplay(VIDEO_STATE_OFF, 0);
+
+  state |= VIDEO_STATE_PLAY_ON;
+
+  if (tape.pausing)
+  {
+    state |= VIDEO_STATE_PAUSE_ON;
+  }
+  else
+  {
+    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()
 {
   struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE];
@@ -550,7 +501,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;
@@ -615,11 +566,21 @@ static void TapeAppendRecording()
   if (!tape.playing || !tape.pausing)
     return;
 
-  tape.pos[tape.counter].delay = tape.delay_played;
+  // stop playing
   tape.playing = FALSE;
+  tape.fast_forward = FALSE;
+  tape.warp_forward = FALSE;
+  tape.pause_before_end = FALSE;
+  tape.deactivate_display = FALSE;
+
+  // start recording
   tape.recording = TRUE;
   tape.changed = TRUE;
 
+  // set current delay (for last played move)
+  tape.pos[tape.counter].delay = tape.delay_played;
+
+  // set current date
   TapeSetDateFromNow();
 
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
@@ -707,44 +668,33 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS])
 
 void TapeTogglePause(boolean toggle_manual)
 {
-  int state = 0;
-
-  if (tape.pause_before_death)
-    state |= VIDEO_STATE_PBEND_OFF;
-  else if (tape.fast_forward)
-    state |= VIDEO_STATE_FFWD_OFF;
-
   tape.pausing = !tape.pausing;
-  tape.fast_forward = FALSE;
-  tape.pause_before_death = FALSE;
 
   if (tape.single_step && toggle_manual)
     tape.single_step = FALSE;
 
-  state |= (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
-  if (tape.playing)
-    state |= VIDEO_STATE_PLAY_ON;
-  else
-    state |= (tape.single_step ? VIDEO_STATE_1STEP_ON : VIDEO_STATE_1STEP_OFF);
-
-  DrawVideoDisplay(state, 0);
+  DrawVideoDisplayPlayState();
 
-  if (tape.warp_forward)
+  if (tape.deactivate_display)
   {
-    TapeStopWarpForward();
+    if (tape.pausing)
+      TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+    else
+      TapeDeactivateDisplayOn();
+  }
 
-    if (tape.quick_resume)
-    {
-      tape.quick_resume = FALSE;
+  if (tape.quick_resume)
+  {
+    tape.quick_resume = FALSE;
 
-      TapeAppendRecording();
+    TapeStopWarpForward();
+    TapeAppendRecording();
 
-      if (!CheckEngineSnapshotSingle())
-	SaveEngineSnapshotSingle();
+    if (!CheckEngineSnapshotSingle())
+      SaveEngineSnapshotSingle();
 
-      // restart step/move snapshots after quick loading tape
-      SaveEngineSnapshotToListInitial();
-    }
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
   }
 
   if (setup.show_snapshot_buttons &&
@@ -802,74 +752,56 @@ 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++)
@@ -943,39 +875,28 @@ unsigned int GetTapeLengthSeconds()
 
 static void TapeStartWarpForward()
 {
+  tape.fast_forward = TRUE;
   tape.warp_forward = TRUE;
+  tape.deactivate_display = TRUE;
 
-  if (!tape.fast_forward && !tape.pause_before_death)
-  {
-    tape.pausing = FALSE;
-    tape.deactivate_display = TRUE;
+  tape.pausing = FALSE;
 
-    TapeDeactivateDisplayOn();
-  }
+  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);
+  DrawVideoDisplayPlayState();
 }
 
 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);
+  DrawVideoDisplayPlayState();
 }
 
 static void TapeSingleStep()
@@ -988,8 +909,7 @@ static void TapeSingleStep()
 
   tape.single_step = !tape.single_step;
 
-  DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON :
-		    VIDEO_STATE_1STEP_OFF), 0);
+  DrawVideoDisplay(VIDEO_STATE_1STEP(tape.single_step), 0);
 }
 
 void TapeQuickSave()
@@ -1386,14 +1306,9 @@ 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;
+
+	DrawVideoDisplayPlayState();
       }
       else if (tape.recording)
 	TapeSingleStep();
@@ -1439,28 +1354,38 @@ static void HandleTapeButtonsExt(int id)
       {
 	if (tape.pausing)			/* PAUSE -> PLAY */
 	{
+	  // continue playing in normal mode
+	  tape.fast_forward = FALSE;
+	  tape.warp_forward = FALSE;
+	  tape.pause_before_end = FALSE;
+	  tape.deactivate_display = FALSE;
+
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
 	}
-	else if (!tape.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);
 	}
+
+	DrawVideoDisplayPlayState();
       }
       break;