X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=3255b4280abc8bc74978e66cd36df44bb07fea33;hp=03dca6bb761c5c4767a3c5236aeab6beac9f9742;hb=cea784bc644569bd9c155de02846dfba9ace036b;hpb=6aab94663ade1e74db318e47629441b065bbea17

diff --git a/src/game.c b/src/game.c
index 03dca6bb..3255b428 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4556,8 +4556,8 @@ void GameWon(void)
 
 	  Feld[ExitX][ExitY] =
 	    (element == EL_EXIT_OPEN		? EL_EXIT_CLOSING :
-	     element == EL_EM_EXIT_OPEN	? EL_EM_EXIT_CLOSING :
-	     element == EL_SP_EXIT_OPEN	? EL_SP_EXIT_CLOSING:
+	     element == EL_EM_EXIT_OPEN		? EL_EM_EXIT_CLOSING :
+	     element == EL_SP_EXIT_OPEN		? EL_SP_EXIT_CLOSING:
 	     element == EL_STEEL_EXIT_OPEN	? EL_STEEL_EXIT_CLOSING:
 	     EL_EM_STEEL_EXIT_CLOSING);
 
@@ -8916,7 +8916,8 @@ static void Life(int ax, int ay)
   for (y1 = -1; y1 < 2; y1++) for (x1 = -1; x1 < 2; x1++)
   {
     int xx = ax+x1, yy = ay+y1;
-    int nachbarn = 0;
+    int old_element = Feld[xx][yy];
+    int num_neighbours = 0;
 
     if (!IN_LEV_FIELD(xx, yy))
       continue;
@@ -8932,16 +8933,16 @@ static void Life(int ax, int ay)
 	    (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y))) &&
 	   !Stop[x][y]) ||
 	  (IS_FREE(x, y) && Stop[x][y]))
-	nachbarn++;
+	num_neighbours++;
     }
 
     if (xx == ax && yy == ay)		/* field in the middle */
     {
-      if (nachbarn < life_parameter[0] ||
-	  nachbarn > life_parameter[1])
+      if (num_neighbours < life_parameter[0] ||
+	  num_neighbours > life_parameter[1])
       {
 	Feld[xx][yy] = EL_EMPTY;
-	if (!Stop[xx][yy])
+	if (Feld[xx][yy] != old_element)
 	  TEST_DrawLevelField(xx, yy);
 	Stop[xx][yy] = TRUE;
 	changed = TRUE;
@@ -8949,12 +8950,12 @@ static void Life(int ax, int ay)
     }
     else if (IS_FREE(xx, yy) || CAN_GROW_INTO(Feld[xx][yy]))
     {					/* free border field */
-      if (nachbarn >= life_parameter[2] &&
-	  nachbarn <= life_parameter[3])
+      if (num_neighbours >= life_parameter[2] &&
+	  num_neighbours <= life_parameter[3])
       {
 	Feld[xx][yy] = element;
 	MovDelay[xx][yy] = (element == EL_GAME_OF_LIFE ? 0 : life_time-1);
-	if (!Stop[xx][yy])
+	if (Feld[xx][yy] != old_element)
 	  TEST_DrawLevelField(xx, yy);
 	Stop[xx][yy] = TRUE;
 	changed = TRUE;