X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftape.c;h=db15dde94b1e7c1307af7f0c136396472395e627;hb=06caafc8481189a73ffc5beb2105aaec5ac0acb5;hp=efa9515672dd23f995194f1ab2682c5686604201;hpb=a1bc27d0855dc6fa72c4c361fc1671b2dcc6547b;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index efa95156..db15dde9 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -30,6 +30,9 @@
 
 #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 *);
 
@@ -315,9 +318,46 @@ void TapeStartRecording()
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
   MapTapeIndexButton();
+
+  SetDrawDeactivationMask(REDRAW_NONE);
 }
 
-void TapeStopRecording()
+static void TapeStartGameRecording()
+{
+  TapeStartRecording();
+
+#if defined(PLATFORM_UNIX)
+  if (options.network)
+    SendToServer_StartPlaying();
+  else
+#endif
+  {
+    game_status = PLAYING;
+    StopAnimation();
+    InitGame();
+  }
+}
+
+static void TapeAppendRecording()
+{
+  if (!tape.playing || !tape.pausing)
+    return;
+
+  if (tape.game_version != GAME_VERSION_ACTUAL &&
+      !Request("This may break old version tape ! Append anyway ?",
+	       REQ_ASK))
+    return;
+
+  tape.pos[tape.counter].delay = tape.delay_played;
+  tape.playing = FALSE;
+  tape.recording = TRUE;
+  tape.changed = TRUE;
+  tape.game_version = GAME_VERSION_ACTUAL;
+
+  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
+}
+
+void TapeHaltRecording()
 {
   if (!tape.recording)
     return;
@@ -325,6 +365,15 @@ void TapeStopRecording()
   tape.counter++;
   tape.length = tape.counter;
   tape.length_seconds = GetTapeLength();
+}
+
+void TapeStopRecording()
+{
+  if (!tape.recording)
+    return;
+
+  TapeHaltRecording();
+
   tape.recording = FALSE;
   tape.pausing = FALSE;
 
@@ -339,7 +388,7 @@ void TapeRecordAction(byte action[MAX_PLAYERS])
   if (!tape.recording || tape.pausing)
     return;
 
-  if (tape.counter >= MAX_TAPELEN-1)
+  if (tape.counter >= MAX_TAPELEN - 1)
   {
     TapeStopRecording();
     return;
@@ -393,6 +442,22 @@ void TapeTogglePause()
     SetDrawDeactivationMask(REDRAW_NONE);
     RedrawPlayfield(TRUE, 0,0,0,0);
   }
+
+  if (tape.index_search)
+  {
+    tape.index_search = FALSE;
+
+    SetDrawDeactivationMask(REDRAW_NONE);
+    RedrawPlayfield(TRUE, 0,0,0,0);
+
+    if (tape.quick_resume)
+    {
+      tape.quick_resume = FALSE;
+
+      TapeAppendRecording();
+      TapeTogglePause();
+    }
+  }
 }
 
 void TapeStartPlaying()
@@ -411,6 +476,7 @@ void TapeStartPlaying()
   tape.pausing = FALSE;
   tape.fast_forward = FALSE;
   tape.index_search = FALSE;
+  tape.quick_resume = FALSE;
 
   InitRND(tape.random_seed);
 
@@ -418,6 +484,17 @@ void TapeStartPlaying()
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
   MapTapeIndexButton();
+
+  SetDrawDeactivationMask(REDRAW_NONE);
+}
+
+static void TapeStartGamePlaying()
+{
+  TapeStartPlaying();
+
+  game_status = PLAYING;
+  StopAnimation();
+  InitGame();
 }
 
 void TapeStopPlaying()
@@ -457,23 +534,13 @@ byte *TapePlayAction()
     }
   }
 
-  if (tape.index_search)
+  if (tape.counter >= tape.length)	/* end of tape reached */
   {
-    if (tape.counter >= tape.length)
-    {
-      tape.index_search = FALSE;
-
-      SetDrawDeactivationMask(REDRAW_NONE);
-      RedrawPlayfield(TRUE, 0,0,0,0);
-
+    if (tape.index_search)
       TapeTogglePause();
-      return NULL;
-    }
-  }
+    else
+      TapeStop();
 
-  if (tape.counter >= tape.length)
-  {
-    TapeStop();
     return NULL;
   }
 
@@ -522,6 +589,51 @@ unsigned int GetTapeLength()
   return(tape_length * GAME_FRAME_DELAY / 1000);
 }
 
+void TapeIndexSearch()
+{
+  tape.index_search = TRUE;
+
+  if (!tape.fast_forward || tape.pause_before_death)
+    SetDrawDeactivationMask(REDRAW_FIELD);
+}
+
+void TapeQuickSave()
+{
+  if (game_status == PLAYING)
+  {
+    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);
+    else
+      SaveTape(tape.level_nr);
+  }
+  else if (game_status == MAINMENU)
+    Request("No game that can be saved !", REQ_CONFIRM);
+}
+
+void TapeQuickLoad()
+{
+  if (game_status == PLAYING || game_status == MAINMENU)
+  {
+    TapeStop();
+    TapeErase();
+
+    LoadTape(level_nr);
+    if (!TAPE_IS_EMPTY(tape))
+    {
+      TapeStartGamePlaying();
+      TapeIndexSearch();
+
+      tape.quick_resume = TRUE;
+    }
+    else
+      Request("No tape for this level !", REQ_CONFIRM);
+  }
+}
+
+
 /* ---------- new tape button stuff ---------------------------------------- */
 
 /* graphic position values for tape buttons */
@@ -680,15 +792,10 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
       break;
 
     case TAPE_CTRL_ID_INDEX:
-      if (tape.recording)
-	printf("Setting index mark ...\n");
-      else if (tape.playing)
-      {
-	printf("Going to index mark ...\n");
-
-	tape.index_search = TRUE;
-	SetDrawDeactivationMask(REDRAW_FIELD);
-      }
+      if (tape.playing)
+	TapeIndexSearch();
+      else if (tape.recording)
+	;	/* setting index mark -- not yet implemented */
       break;
 
     case TAPE_CTRL_ID_STOP:
@@ -701,32 +808,11 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 
     case TAPE_CTRL_ID_RECORD:
       if (TAPE_IS_STOPPED(tape))
-      {
-	TapeStartRecording();
-
-#if defined(PLATFORM_UNIX)
-	if (options.network)
-	  SendToServer_StartPlaying();
-	else
-#endif
-	{
-	  game_status = PLAYING;
-	  StopAnimation();
-	  InitGame();
-	}
-      }
+	TapeStartGameRecording();
       else if (tape.pausing)
       {
 	if (tape.playing)	/* PLAYING -> PAUSING -> RECORDING */
-	{
-	  tape.pos[tape.counter].delay = tape.delay_played;
-	  tape.playing = FALSE;
-	  tape.recording = TRUE;
-	  tape.changed = TRUE;
-	  tape.game_version = GAME_VERSION_ACTUAL;
-
-	  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
-	}
+	  TapeAppendRecording();
 	else
 	  TapeTogglePause();
       }
@@ -738,27 +824,25 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 
       if (TAPE_IS_STOPPED(tape))
       {
-	TapeStartPlaying();
-
-	game_status = PLAYING;
-	StopAnimation();
-	InitGame();
+	TapeStartGamePlaying();
       }
       else if (tape.playing)
       {
 	if (tape.pausing)			/* PAUSE -> PLAY */
+	{
 	  TapeTogglePause();
+	}
 	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 */
+	else if (!tape.pause_before_death)	/* FFWD PLAY -> AUTO PAUSE */
 	{
 	  tape.pause_before_death = TRUE;
 	  DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
 	}
-	else					/* -> NORMAL PLAY */
+	else					/* AUTO PAUSE -> NORMAL PLAY */
 	{
 	  tape.fast_forward = FALSE;
 	  tape.pause_before_death = FALSE;