X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftape.c;h=963ca1e89a6253b7a8f6d25fc9c264612395554c;hb=00ca5a80f980e039d78ed670e88f88a85d222461;hp=24adbca12074afb8ab928d583a0dc8f99e7827e6;hpb=19bc627960bdbec5e180e466b5956d3e1bb1a2a1;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 24adbca1..963ca1e8 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -765,9 +765,6 @@ byte *TapePlayAction()
   {
     if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
-      tape.fast_forward = FALSE;
-      tape.pause_before_end = FALSE;
-
       TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
 
@@ -778,22 +775,33 @@ byte *TapePlayAction()
   if (tape.counter >= tape.length)	/* end of tape reached */
   {
     if (tape.warp_forward && !tape.auto_play)
+    {
+      TapeStopWarpForward();
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+    }
     else
+    {
       TapeStop();
+    }
 
     return NULL;
   }
 
   if (update_video_display && !tape.deactivate_display)
   {
-    if (tape.pause_before_end)
-      DrawVideoDisplayLabel(VIDEO_STATE_PBEND(update_draw_label_on));
-    else if (tape.fast_forward)
-      DrawVideoDisplayLabel(VIDEO_STATE_FFWD(update_draw_label_on));
+    int state = 0;
 
     if (tape.warp_forward)
-      DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
+      state |= VIDEO_STATE_WARP(update_draw_label_on);
+    else if (tape.fast_forward)
+      state |= VIDEO_STATE_FFWD(update_draw_label_on);
+
+    if (tape.pause_before_end)
+      state |= VIDEO_STATE_PBEND(update_draw_label_on);
+
+    // draw labels and symbols separately to prevent labels overlapping symbols
+    DrawVideoDisplayLabel(state);
+    DrawVideoDisplaySymbol(state);
   }
 
   for (i = 0; i < MAX_PLAYERS; i++)
@@ -867,43 +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_end)
-  {
-    tape.pausing = FALSE;
-    tape.pause_before_end = TRUE;
-    tape.deactivate_display = TRUE;
+  tape.pausing = FALSE;
 
-    TapeDeactivateDisplayOn();
+  TapeDeactivateDisplayOn();
 
-    DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
-    DrawVideoDisplaySymbol(VIDEO_STATE_WARP_ON);
-  }
-  else
-  {
-    DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
-  }
+  DrawVideoDisplayPlayState();
 }
 
 static void TapeStopWarpForward()
 {
-  int state = VIDEO_STATE_PAUSE(tape.pausing);
-
-  if (tape.deactivate_display)
-    tape.pause_before_end = FALSE;
-
+  tape.fast_forward = FALSE;
   tape.warp_forward = FALSE;
   tape.deactivate_display = FALSE;
 
-  TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+  tape.pause_before_end = FALSE;
 
-  state |= VIDEO_STATE_WARP_OFF;
-  state |= (tape.pause_before_end ? VIDEO_STATE_PBEND_ON :
-	    tape.fast_forward     ? VIDEO_STATE_FFWD_ON :
-	    VIDEO_STATE_PLAY_ON);
+  TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
 
-  DrawVideoDisplay(state, 0);
+  DrawVideoDisplayPlayState();
 }
 
 static void TapeSingleStep()
@@ -1313,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 */
@@ -1349,6 +1339,7 @@ static void HandleTapeButtonsExt(int id)
 	else
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
+
       break;
 
     case TAPE_CTRL_ID_PLAY:
@@ -1373,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;
-
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
+	  tape.deactivate_display = TRUE;
 
-	  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: