From: Holger Schemel <info@artsoft.org>
Date: Wed, 10 Oct 2018 20:45:55 +0000 (+0200)
Subject: fixed bugs in game logic of "game of life" and "biomaze" elements
X-Git-Tag: 4.1.2.0~144
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=5ca67e4a3635103eba79522fd88fbaca89152815;p=rocksndiamonds.git

fixed bugs in game logic of "game of life" and "biomaze" elements
---

diff --git a/src/game.c b/src/game.c
index fefe353d..18d020bd 100644
--- a/src/game.c
+++ b/src/game.c
@@ -8896,6 +8896,7 @@ static void Life(int ax, int ay)
   int *life_parameter = (element == EL_GAME_OF_LIFE ? level.game_of_life :
 			 level.biomaze);
   boolean changed = FALSE;
+  boolean use_life_bugs = FALSE;
 
   if (IS_ANIMATED(graphic))
     DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
@@ -8929,13 +8930,28 @@ static void Life(int ax, int ay)
       if (!IN_LEV_FIELD(x, y) || (x == xx && y == yy))
 	continue;
 
-      if (((Feld[x][y] == element ||
-	    (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y))) &&
-	   !Stop[x][y]) ||
-	  (IS_FREE(x, y) && Stop[x][y]))
+      boolean is_player_cell = (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y));
+      boolean is_neighbour = FALSE;
+
+      if (use_life_bugs)
+	is_neighbour =
+	  (((Feld[x][y] == element || is_player_cell) && !Stop[x][y]) ||
+	   (IS_FREE(x, y)                             &&  Stop[x][y]));
+      else
+	is_neighbour =
+	  (Last[x][y] == element || is_player_cell);
+
+      if (is_neighbour)
 	num_neighbours++;
     }
 
+    boolean is_free = FALSE;
+
+    if (use_life_bugs)
+      is_free = (IS_FREE(xx, yy));
+    else
+      is_free = (IS_FREE(xx, yy) && Last[xx][yy] == EL_EMPTY);
+
     if (xx == ax && yy == ay)		/* field in the middle */
     {
       if (num_neighbours < life_parameter[0] ||
@@ -8948,7 +8964,7 @@ static void Life(int ax, int ay)
 	changed = TRUE;
       }
     }
-    else if (IS_FREE(xx, yy) || CAN_GROW_INTO(Feld[xx][yy]))
+    else if (is_free || CAN_GROW_INTO(Feld[xx][yy]))
     {					/* free border field */
       if (num_neighbours >= life_parameter[2] &&
 	  num_neighbours <= life_parameter[3])