rnd-19981108-2

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 08d980b2a3efae544677aaf7596e2cdb8eab1912..017adc470abf7a353bd45c16c5738af65bff89cc 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -59,7 +59,7 @@ void InitGame()
     player->active = FALSE;
 
     player->action = 0;
-    player->potential_action = 0;
+    player->effective_action = 0;
 
     player->score = 0;
     player->gems_still_needed = level.edelsteine;
@@ -287,6 +287,28 @@ void InitGame()
     }
   }
 
+  /* when in single player mode, eliminate all but the first active player */
+  if (!options.network && !setup.team_mode)
+  {
+    for(i=0; i<MAX_PLAYERS; i++)
+    {
+      if (stored_player[i].active)
+      {
+       for(j=i+1; j<MAX_PLAYERS; j++)
+       {
+         struct PlayerInfo *player = &stored_player[j];
+         int jx = player->jx, jy = player->jy;
+
+         if (player->active)
+         {
+           player->active = FALSE;
+           StorePlayer[jx][jy] = 0;
+           Feld[jx][jy] = EL_LEERRAUM;
+         }
+       }
+      }
+    }
+  }
 
   for(i=0; i<MAX_PLAYERS; i++)
   {
@@ -522,7 +544,7 @@ void GameWon()
   if (tape.recording)
   {
     TapeStop();
-    SaveLevelTape(tape.level_nr);      /* Ask to save tape */
+    SaveTape(tape.level_nr);           /* Ask to save tape */
   }
 
   if ((hi_pos=NewHiScore()) >= 0) 
@@ -2810,7 +2832,7 @@ void CheckForDragon(int x, int y)
   }
 }
 
-void PlayerActions(struct PlayerInfo *player, byte player_action)
+static void PlayerActions(struct PlayerInfo *player, byte player_action)
 {
   static byte stored_player_action[MAX_PLAYERS];
   static int num_stored_actions = 0;
@@ -2915,6 +2937,7 @@ void GameActions()
   int sieb_x = 0, sieb_y = 0;
   int i, x,y, element;
   byte *recorded_player_action;
+  byte summarized_player_action = 0;
 
   if (game_status != PLAYING)
     return;
@@ -2968,19 +2991,23 @@ void GameActions()
 
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
-  if (network_playing)
+  for(i=0; i<MAX_PLAYERS; i++)
   {
-    byte local_potential_action = 0;
-
-    for(i=0; i<MAX_PLAYERS; i++)
-      local_potential_action |= stored_player[i].potential_action;
+    summarized_player_action |= stored_player[i].action;
 
-    SendToServer_MovePlayer(local_potential_action);
+    if (!network_playing)
+      stored_player[i].effective_action = stored_player[i].action;
   }
 
+  if (network_playing)
+    SendToServer_MovePlayer(summarized_player_action);
+
+  if (!options.network && !setup.team_mode)
+    local_player->effective_action = summarized_player_action;
+
   for(i=0; i<MAX_PLAYERS; i++)
   {
-    int actual_player_action = stored_player[i].action;
+    int actual_player_action = stored_player[i].effective_action;
 
     if (recorded_player_action)
       actual_player_action = recorded_player_action[i];
@@ -3295,7 +3322,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     /* should only happen if pre-1.0 tape recordings are played */
     /* this is only for backward compatibility */
 
-#ifdef DEBUG
+#if DEBUG
     printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.0 LEVEL TAPES.\n");
 #endif
 
@@ -3346,8 +3373,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
          scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
 
        /* don't scroll over playfield boundaries */
-       if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 2)
-         scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 2);
+       if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 1)
+         scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 1);
 
        /* don't scroll more than one field at a time */
        scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
@@ -3364,8 +3391,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
          scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
 
        /* don't scroll over playfield boundaries */
-       if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 2)
-         scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 2);
+       if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 1)
+         scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 1);
 
        /* don't scroll more than one field at a time */
        scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);