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

diff --git a/src/tape.c b/src/tape.c
index c10edefc..128c38b0 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
 
@@ -615,11 +615,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_death = 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);
@@ -709,19 +719,18 @@ 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.pause_before_death)
+    state |= (tape.pausing ? VIDEO_STATE_PBEND_OFF : VIDEO_STATE_PBEND_ON);
+  else if (tape.fast_forward)
+    state |= (tape.pausing ? VIDEO_STATE_FFWD_OFF : VIDEO_STATE_FFWD_ON);
+
   if (tape.playing)
     state |= VIDEO_STATE_PLAY_ON;
   else
@@ -731,12 +740,23 @@ void TapeTogglePause(boolean toggle_manual)
 
   if (tape.warp_forward)
   {
-    TapeStopWarpForward();
+    if (tape.pausing)
+    {
+      TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
+    }
+    else
+    {
+      if (tape.deactivate_display)
+	TapeDeactivateDisplayOn();
+
+      DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+    }
 
     if (tape.quick_resume)
     {
       tape.quick_resume = FALSE;
 
+      TapeStopWarpForward();
       TapeAppendRecording();
 
       if (!CheckEngineSnapshotSingle())
@@ -802,65 +822,45 @@ 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_death)  // stop some seconds before end of tape
   {
-    if (!(FrameCounter % 20))
+    if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
-      if ((FrameCounter / 20) % 2)
-	DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
-      else
-	DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
-    }
+      tape.fast_forward = FALSE;
+      tape.pause_before_death = FALSE;
 
-    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);
-    }
+      DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, 0);
 
-    if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
-    {
+      TapeStopWarpForward();
       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 (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);
+    if (tape.pause_before_death)
+      DrawVideoDisplay(update_draw_label_on ?
+		       VIDEO_STATE_PBEND_ON :
+		       VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+    else if (tape.fast_forward)
+      DrawVideoDisplay(update_draw_label_on ?
+		       VIDEO_STATE_FFWD_ON :
+		       VIDEO_STATE_FFWD_OFF, VIDEO_DISPLAY_LABEL_ONLY);
 
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+    if (tape.warp_forward)
+      DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
   }
-#endif
 
   if (tape.counter >= tape.length)	/* end of tape reached */
   {
@@ -948,21 +948,27 @@ static void TapeStartWarpForward()
   if (!tape.fast_forward && !tape.pause_before_death)
   {
     tape.pausing = FALSE;
+    tape.pause_before_death = TRUE;
     tape.deactivate_display = TRUE;
 
     TapeDeactivateDisplayOn();
-  }
 
-  if (tape.fast_forward || tape.pause_before_death)
+    DrawVideoDisplay(VIDEO_STATE_PBEND_ON, 0);
     DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+  }
   else
-    DrawVideoDisplay(VIDEO_STATE_WARP_ON, 0);
+  {
+    DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
+  }
 }
 
 static void TapeStopWarpForward()
 {
   int state = (tape.pausing ? VIDEO_STATE_PAUSE_ON : VIDEO_STATE_PAUSE_OFF);
 
+  if (tape.deactivate_display)
+    tape.pause_before_death = FALSE;
+
   tape.warp_forward = FALSE;
   tape.deactivate_display = FALSE;
 
@@ -1390,6 +1396,10 @@ static void HandleTapeButtonsExt(int id)
 	{
 	  TapeStartWarpForward();
 	}
+	else if (tape.pausing)			/* PAUSE -> WARP FORWARD PLAY */
+	{
+	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
+	}
 	else					/* WARP FORWARD PLAY -> PLAY */
 	{
 	  TapeStopWarpForward();
@@ -1439,17 +1449,33 @@ 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_death = FALSE;
+	  tape.deactivate_display = FALSE;
+
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
 	}
+	else if (tape.warp_forward &&
+		 !tape.fast_forward)		/* WARP FORWARD PLAY -> PLAY */
+	{
+	  TapeStopWarpForward();
+	}
 	else if (!tape.fast_forward)		/* PLAY -> FAST FORWARD PLAY */
 	{
 	  tape.fast_forward = TRUE;
+
 	  DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
 	}
 	else if (!tape.pause_before_death)	/* FFWD PLAY -> AUTO PAUSE */
 	{
 	  tape.pause_before_death = TRUE;
+
 	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0);
+
+	  if (tape.warp_forward)
+	    DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
 	}
 	else					/* AUTO PAUSE -> NORMAL PLAY */
 	{