rnd-20140218-2-src

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

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index fcf96d3a8a9850ee4c14253f586fbf6ed301bcea..6dc72ee018c777fd42aaa202a1e2a18828996346 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -1109,7 +1109,11 @@ void prepare_em_level(void)
 {
   int i, x, y;
   int players_left;
+#if 1
+  boolean team_mode;
+#else
   int num_tape_players;
+#endif
 
   /* reset all runtime variables to their initial values */
 
@@ -1176,12 +1180,27 @@ void prepare_em_level(void)
     }
   }
 
+#if 1
+  team_mode = getTeamMode_EM();
+
+  if (!team_mode)
+    lev.home_initial = 1;
+#else
   num_tape_players = getNumActivePlayers_EM();
 
+#if 0
+  printf("::: getNumActivePlayers_EM: %d\n", num_tape_players);
+#endif
+
+#if 1
+  lev.home_initial = MIN(lev.home_initial, num_tape_players);
+#else
   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);
+#endif
+#endif
 
   lev.home = lev.home_initial;
   players_left = lev.home_initial;
@@ -1233,4 +1252,6 @@ void prepare_em_level(void)
 
   for (i = 0; i < MAX_PLAYERS; i++)
     game_em.last_player_direction[i] = MV_NONE;
+
+  lev.exit_x = lev.exit_y = -1;        /* kludge for playing player exit sound */
 }