rnd-19981020-1

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 4851f4aa7745267c5226d1012c325fba70dcac4f..2024abb41b49e957be9fabc3f2644f01e6dcb53f 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -197,17 +197,26 @@ void InitGame()
        {
          player->active = TRUE;
 
+         /* remove potentially duplicate players */
+         if (StorePlayer[jx][jy] == Feld[x][y])
+           StorePlayer[jx][jy] = 0;
+
+         StorePlayer[x][y] = Feld[x][y];
+
          printf("Player %d activated.\n", player->element_nr);
          printf("[Local player is %d and currently %s.]\n",
                 local_player->element_nr,
                 local_player->active ? "active" : "not active");
        }
 
+#if 0
        /* remove potentially duplicate players */
        if (StorePlayer[jx][jy] == Feld[x][y])
          StorePlayer[jx][jy] = 0;
 
        StorePlayer[x][y] = Feld[x][y];
+#endif
+
        Feld[x][y] = EL_LEERRAUM;
        player->jx = player->last_jx = x;
        player->jy = player->last_jy = y;
@@ -2939,18 +2948,13 @@ void GameActions(byte player_action)
   long action_delay_value;
   int sieb_x = 0, sieb_y = 0;
   int i, x,y, element;
-  int *recorded_player_action;
+  byte *recorded_player_action;
 
   if (game_status != PLAYING)
     return;
 
-#ifdef DEBUG
-  action_delay_value =
-    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GameFrameDelay);
-#else
   action_delay_value =
-    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GAME_FRAME_DELAY);
-#endif
+    (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
 
   /* main game synchronization point */
   WaitUntilDelayReached(&action_delay, action_delay_value);
@@ -2986,32 +2990,16 @@ void GameActions(byte player_action)
   else if (tape.recording)
     TapeRecordDelay();
 
-
-  if (tape.playing)
-    recorded_player_action = TapePlayAction();
-  else
-    recorded_player_action = NULL;
+  recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
   if (network_playing)
     SendToServer_MovePlayer(player_action);
 
   for(i=0; i<MAX_PLAYERS; i++)
   {
-    /*
-    int actual_player_action =
-      (options.network ? network_player_action[i] : player_action);
-      */
-
     int actual_player_action =
       (network_playing ? network_player_action[i] : player_action);
 
-    /*
-    int actual_player_action = network_player_action[i];
-    */
-
-    /*
-    int actual_player_action = player_action;
-    */
 
     /* TEST TEST TEST */
 
@@ -3025,6 +3013,7 @@ void GameActions(byte player_action)
 
     /* TEST TEST TEST */
 
+
     if (recorded_player_action)
       actual_player_action = recorded_player_action[i];
 
@@ -3038,13 +3027,6 @@ void GameActions(byte player_action)
 
   ScrollScreen(NULL, SCROLL_GO_ON);
 
-  /*
-  if (tape.pausing || (tape.playing && !TapePlayDelay()))
-    return;
-  else if (tape.recording)
-    TapeRecordDelay();
-  */
-
   FrameCounter++;
   TimeFrames++;