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

diff --git a/src/tape.c b/src/tape.c
index becd0ad9..1259c0d5 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()
@@ -613,7 +613,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;
   }
@@ -706,8 +706,6 @@ static void TapeStartGamePlaying()
 {
   TapeStartPlaying();
 
-  game_status = GAME_MODE_PLAYING;
-  StopAnimation();
   InitGame();
 }
 
@@ -803,14 +801,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 +833,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()