X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=fc90ad51461d9beccc831c1cb5c712268ae48074;hb=5ae3fc5d27076677a95153162abcf527c6dc8e63;hp=becd0ad9affd199b714e7c3c663ede2383c65331;hpb=c4dd9e14b72b528e82bc018fe2fa76b784221584;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index becd0ad9..fc90ad51 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -542,14 +542,14 @@ static void TapeStartGameRecording()
 
 #if defined(NETWORK_AVALIABLE)
   if (options.network)
-    SendToServer_StartPlaying();
-  else
-#endif
   {
-    game_status = GAME_MODE_PLAYING;
-    StopAnimation();
-    InitGame();
+    SendToServer_StartPlaying();
+
+    return;
   }
+#endif
+
+  InitGame();
 }
 
 static void TapeAppendRecording()
@@ -566,6 +566,10 @@ static void TapeAppendRecording()
 
   DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
   DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0);
+
+#if 1
+  UpdateAndDisplayGameControlValues();
+#endif
 }
 
 void TapeHaltRecording()
@@ -613,7 +617,7 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS])
     for (i = 0; i < MAX_PLAYERS; i++)
       if (tape.centered_player_nr_next == i ||
 	  tape.centered_player_nr_next == -1)
-	action[i] |= SET_FOCUS;
+	action[i] |= KEY_SET_FOCUS;
 
     tape.set_centered_player = FALSE;
   }
@@ -677,6 +681,9 @@ void TapeTogglePause(boolean toggle_manual)
       tape.quick_resume = FALSE;
 
       TapeAppendRecording();
+
+      if (!CheckEngineSnapshot())
+	SaveEngineSnapshot();
     }
   }
 }
@@ -706,8 +713,6 @@ static void TapeStartGamePlaying()
 {
   TapeStartPlaying();
 
-  game_status = GAME_MODE_PLAYING;
-  StopAnimation();
   InitGame();
 }
 
@@ -803,14 +808,14 @@ byte *TapePlayAction()
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (action[i] & SET_FOCUS)
+    if (action[i] & KEY_SET_FOCUS)
     {
       tape.set_centered_player = TRUE;
       tape.centered_player_nr_next =
 	(tape.centered_player_nr_next == -999 ? i : -1);
     }
 
-    action[i] &= ~SET_FOCUS;
+    action[i] &= ~KEY_SET_FOCUS;
   }
 
   tape.delay_played++;
@@ -835,11 +840,6 @@ void TapeStop()
     DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
   }
-
-#if 0
-  if (tape.auto_play)
-    AutoPlayTape();	/* continue automatically playing next tape */
-#endif
 }
 
 unsigned int GetTapeLength()
@@ -909,18 +909,28 @@ static void TapeSingleStep()
 
 void TapeQuickSave()
 {
-  if (game_status == GAME_MODE_PLAYING)
+  if (game_status == GAME_MODE_MAIN)
   {
-    if (tape.recording)
-      TapeHaltRecording();	/* prepare tape for saving on-the-fly */
+    Request("No game that can be saved !", REQ_CONFIRM);
 
-    if (TAPE_IS_EMPTY(tape))
-      Request("No tape that can be saved !", REQ_CONFIRM);
-    else
-      SaveTape(tape.level_nr);
+    return;
   }
-  else if (game_status == GAME_MODE_MAIN)
-    Request("No game that can be saved !", REQ_CONFIRM);
+
+  if (game_status != GAME_MODE_PLAYING)
+    return;
+
+  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);
+
+    return;
+  }
+
+  if (SaveTapeChecked(tape.level_nr))
+    SaveEngineSnapshot();
 }
 
 void TapeQuickLoad()
@@ -942,25 +952,44 @@ void TapeQuickLoad()
     return;
   }
 
-  if (game_status == GAME_MODE_PLAYING || game_status == GAME_MODE_MAIN)
+  if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN)
+    return;
+
+  if (CheckEngineSnapshot())
   {
-    TapeStop();
-    TapeErase();
+    TapeStartGamePlaying();
 
-    LoadTape(level_nr);
-    if (!TAPE_IS_EMPTY(tape))
-    {
-      TapeStartGamePlaying();
-      TapeStartWarpForward();
+    LoadEngineSnapshot();
 
-      tape.quick_resume = TRUE;
-    }
-    else	/* this should not happen (basically checked above) */
-    {
-      int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
+    DrawCompleteVideoDisplay();
 
-      Request("No tape for this level !", REQ_CONFIRM | reopen_door);
-    }
+    tape.playing = TRUE;
+    tape.pausing = TRUE;
+
+    TapeStopWarpForward();
+    TapeAppendRecording();
+
+    if (FrameCounter > 0)
+      return;
+  }
+
+  TapeStop();
+  TapeErase();
+
+  LoadTape(level_nr);
+
+  if (!TAPE_IS_EMPTY(tape))
+  {
+    TapeStartGamePlaying();
+    TapeStartWarpForward();
+
+    tape.quick_resume = TRUE;
+  }
+  else	/* this should not happen (basically checked above) */
+  {
+    int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
+
+    Request("No tape for this level !", REQ_CONFIRM | reopen_door);
   }
 }
 
@@ -1214,6 +1243,7 @@ void CreateTapeButtons()
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
 		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+		      GDI_DIRECT_DRAW, FALSE,
 		      GDI_EVENT_MASK, GD_EVENT_RELEASED,
 		      GDI_CALLBACK_ACTION, HandleTapeButtons,
 		      GDI_END);
@@ -1276,18 +1306,22 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
   {
     case TAPE_CTRL_ID_EJECT:
       TapeStop();
+
       if (TAPE_IS_EMPTY(tape))
       {
 	LoadTape(level_nr);
+
 	if (TAPE_IS_EMPTY(tape))
 	  Request("No tape for this level !", REQ_CONFIRM);
       }
       else
       {
 	if (tape.changed)
-	  SaveTape(tape.level_nr);
+	  SaveTapeChecked(tape.level_nr);
+
 	TapeErase();
       }
+
       DrawCompleteVideoDisplay();
       break;
 
@@ -1305,6 +1339,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
       }
       else if (tape.recording)
 	TapeSingleStep();
+
       break;
 
     case TAPE_CTRL_ID_STOP: