X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=4edcf7e8c16fe8cf0e9f902014b4f35c45a6832a;hp=8340553f0af9059e4e58c9175b55cb9a067c61b4;hb=9e4358919afd28bdb4481eaf8daf4dcd4eca3e02;hpb=9e08928735ed2195ecceb20747e705cfd3c7c5d2

diff --git a/src/game.c b/src/game.c
index 8340553f..4edcf7e8 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1112,6 +1112,7 @@ void TestIfGoodThingGetsHitByBadThing(int, int, int);
 void KillPlayer(struct PlayerInfo *);
 void BuryPlayer(struct PlayerInfo *);
 void RemovePlayer(struct PlayerInfo *);
+void RemovePlayerWithCleanup(struct PlayerInfo *);
 
 static int getInvisibleActiveFromInvisibleElement(int);
 static int getInvisibleFromInvisibleActiveElement(int);
@@ -4707,7 +4708,7 @@ void GameEnd()
 
   hi_pos = NewHiScore(last_level_nr);
 
-  if (hi_pos >= 0)
+  if (hi_pos >= 0 && !setup.skip_scores_after_game)
   {
     SetGameStatus(GAME_MODE_SCORES);
 
@@ -12641,12 +12642,12 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
 	Feld[jx][jy] == EL_SP_EXIT_OPEN ||
 	Feld[jx][jy] == EL_SP_EXIT_OPENING)	/* <-- special case */
     {
-      DrawPlayer(player);	/* needed here only to cleanup last field */
-      RemovePlayer(player);
+      RemovePlayerWithCleanup(player);
 
-      if (local_player->friends_still_needed == 0 ||
-	  IS_SP_ELEMENT(Feld[jx][jy]))
-	PlayerWins(player);
+      if ((local_player->friends_still_needed == 0 ||
+	   IS_SP_ELEMENT(Feld[jx][jy])) &&
+	  AllPlayersGone)
+	PlayerWins(local_player);
     }
 
     /* this breaks one level: "machine", level 000 */
@@ -13402,6 +13403,12 @@ void RemovePlayer(struct PlayerInfo *player)
   ExitY = ZY = jy;
 }
 
+void RemovePlayerWithCleanup(struct PlayerInfo *player)
+{
+  DrawPlayer(player);	/* needed here only to cleanup last field */
+  RemovePlayer(player);
+}
+
 static void setFieldForSnapping(int x, int y, int element, int direction)
 {
   struct ElementInfo *ei = &element_info[element];