X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=963ca1e89a6253b7a8f6d25fc9c264612395554c;hb=33843542519f8ddc28d1ad563124b151cf79425c;hp=0c13baa662c32516b02d2f677a34a3a30928f7aa;hpb=924c7a3933d49d4fb53ad39c8f767ac259052404;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 0c13baa6..963ca1e8 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1306,35 +1306,32 @@ static void HandleTapeButtonsExt(int id)
     case TAPE_CTRL_ID_EXTRA:
       if (tape.playing)
       {
-	if (!tape.warp_forward)			/* PLAY -> WARP FORWARD PLAY */
-	{
-	  TapeStartWarpForward();
-	}
-	else if (tape.pausing)			/* PAUSE -> WARP FORWARD PLAY */
-	{
-	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
-	}
-	else					/* WARP FORWARD PLAY -> PLAY */
-	{
-	  TapeStopWarpForward();
-	}
+	tape.pause_before_end = !tape.pause_before_end;
+
+	DrawVideoDisplayPlayState();
       }
       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 */
@@ -1342,6 +1339,7 @@ static void HandleTapeButtonsExt(int id)
 	else
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
+
       break;
 
     case TAPE_CTRL_ID_PLAY:
@@ -1366,42 +1364,38 @@ static void HandleTapeButtonsExt(int id)
 	  // continue playing in normal mode
 	  tape.fast_forward = FALSE;
 	  tape.warp_forward = FALSE;
-	  tape.pause_before_end = FALSE;
 	  tape.deactivate_display = FALSE;
 
+	  tape.pause_before_end = FALSE;
+
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
 	}
-	else if (tape.warp_forward &&
-		 !tape.fast_forward)		/* WARP FORWARD PLAY -> PLAY */
+	else if (!tape.fast_forward)		/* PLAY -> FFWD */
 	{
-	  TapeStopWarpForward();
+	  tape.fast_forward = TRUE;
 	}
-	else if (!tape.fast_forward)		/* PLAY -> FAST FORWARD PLAY */
+	else if (!tape.warp_forward)		/* FFWD -> WARP */
 	{
-	  tape.fast_forward = TRUE;
-
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
+	  tape.warp_forward = TRUE;
 	}
-	else if (!tape.pause_before_end)	/* FFWD PLAY -> AUTO PAUSE */
+	else if (!tape.deactivate_display)	/* WARP -> WARP BLIND */
 	{
-	  tape.pause_before_end = TRUE;
+	  tape.deactivate_display = TRUE;
 
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
-
-	  if (tape.warp_forward)
-	    DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
+	  TapeDeactivateDisplayOn();
 	}
-	else					/* AUTO PAUSE -> NORMAL PLAY */
+	else					/* WARP BLIND -> PLAY */
 	{
-	  if (tape.warp_forward)
-	    TapeStopWarpForward();
-
 	  tape.fast_forward = FALSE;
-	  tape.pause_before_end = 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;
 
     default: