rnd-20060304-1-src

[rocksndiamonds.git] / src / game_em / convert.c

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index e695f3735497af8c8443d68c97a0c2f010bcd19f..9b888ffce11733dff5f6825af16a24491971ee77 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -903,6 +903,7 @@ void prepare_em_level(void)
 {
   int i, x, y;
   int players_left;
+  int num_tape_players;
 
   /* reset all runtime variables to their initial values */
 
@@ -969,7 +970,11 @@ void prepare_em_level(void)
     }
   }
 
-  if (!setup.team_mode)
+  num_tape_players = getActivePlayers_EM();
+
+  if (num_tape_players != -1)
+    lev.home_initial = MIN(lev.home_initial, num_tape_players);
+  else if (!setup.team_mode)
     lev.home_initial = MIN(lev.home_initial, 1);
 
   lev.home = lev.home_initial;
@@ -986,7 +991,12 @@ void prepare_em_level(void)
       }
       else
       {
-       native_em_level.cave[ply[i].x_initial][ply[i].y_initial] = Xblank;
+       int x = ply[i].x_initial;
+       int y = ply[i].y_initial;
+
+       native_em_level.cave[x][y] = Xblank;
+
+       Cave[y][x] = Next[y][x] = Draw[y][x] = Xblank;
       }
     }
   }
@@ -1011,4 +1021,10 @@ void prepare_em_level(void)
           i, ply[i].x_initial, ply[i].y_initial, ply[i].alive);
 #endif
   }
+
+  game_em.any_player_moving = FALSE;
+  game_em.last_moving_player = 0;      /* default: first player */
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    game_em.last_player_direction[i] = MV_NONE;
 }