fixed bug with playing EM level with inactive player

diff --git a/src/engines.h b/src/engines.h
index bce3021715d77d8fdc907af876e3af33828c320d..f51868556b3ae5408930c1d59d91a2f3f42a5135 100644 (file)
--- a/src/engines.h
+++ b/src/engines.h
@@ -28,6 +28,7 @@
 void UpdateEngineValues(int, int, int, int);
 
 boolean getTeamMode_EM(void);
+boolean isActivePlayer_EM(int);
 
 void PlayLevelSound_EM(int, int, int, int);
 void InitGraphicInfo_EM(void);

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index d8a202d6166883b03cc5fbcdbd8987c407a248c8..6b09ece6a7b26ec5a06e9e4975dbdf32d6b1a490 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -404,7 +404,7 @@ void prepare_em_level(void)
   /* assign active players */
   for (i = 0; i < MAX_PLAYERS; i++)
   {
-    if (ply[i].exists)
+    if (ply[i].exists && isActivePlayer_EM(i))
     {
       if (players_left)
       {

diff --git a/src/tools.c b/src/tools.c
index 078af1ba745e4fe6ae521f619d4a38d771d223cc..1dbc1a5549b53bd94b6710a1a263f27ed6b874fb 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -8272,6 +8272,11 @@ boolean getTeamMode_EM(void)
   return game.team_mode || network_playing;
 }
 
+boolean isActivePlayer_EM(int player_nr)
+{
+  return stored_player[player_nr].active;
+}
+
 unsigned int InitRND(int seed)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)