X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=12397d5c4f262cf5367957a8c78e32c06f37f081;hb=99261bc36a147246e39cdc6d5ce9b098257c4d1b;hp=2fb1b686c7ae07a5482a68cc21e459993164d4b1;hpb=10406b9d6cad2b0ec7c30c71520abe2c702bccbc;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 2fb1b686..12397d5c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -11117,34 +11117,32 @@ static void CheckLevelSolved(void)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
-    if (level.native_em_level->lev->home == 0)	// all players at home
+    if (game_em.level_solved &&
+	!game_em.game_over)				// game won
     {
       PlayerWins(local_player);
 
-      AllPlayersGone = TRUE;
+      game_em.game_over = TRUE;
 
-      level.native_em_level->lev->home = -1;
+      AllPlayersGone = TRUE;
     }
 
-    if (level.native_em_level->ply[0]->alive == 0 &&
-	level.native_em_level->ply[1]->alive == 0 &&
-	level.native_em_level->ply[2]->alive == 0 &&
-	level.native_em_level->ply[3]->alive == 0)	// all dead
+    if (game_em.game_over)				// game lost
       AllPlayersGone = TRUE;
   }
   else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
   {
-    if (game_sp.LevelSolved &&
-	!game_sp.GameOver)				// game won
+    if (game_sp.level_solved &&
+	!game_sp.game_over)				// game won
     {
       PlayerWins(local_player);
 
-      game_sp.GameOver = TRUE;
+      game_sp.game_over = TRUE;
 
       AllPlayersGone = TRUE;
     }
 
-    if (game_sp.GameOver)				// game lost
+    if (game_sp.game_over)				// game lost
       AllPlayersGone = TRUE;
   }
   else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
@@ -15041,9 +15039,9 @@ boolean checkGameFailed(void)
     return FALSE;
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return (level.native_em_level->lev->home > 0);
+    return (game_em.game_over && !game_em.level_solved);
   else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return (game_sp.GameOver && !game_sp.LevelSolved);
+    return (game_sp.game_over && !game_sp.level_solved);
   else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     return (game_mm.game_over && !game_mm.level_solved);
   else				// GAME_ENGINE_TYPE_RND