From 88f97ff2ecf7e88687a12eddd90a88dda0047390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Thu, 29 Oct 2020 17:17:09 +0100
Subject: [PATCH] Another GOL rendering fix

---
 src/client/GameSave.cpp          | 2 +-
 src/simulation/elements/LIFE.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 8af9cd1e9..c6a0ca1f6 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -1299,7 +1299,7 @@ void GameSave::readOPS(char * data, int dataLength)
 						}
 						break;
 					case PT_LIFE:
-						if (savedVersion < 95 || minorVersion < 1)
+						if (savedVersion < 96 && !fakeNewerVersion)
 						{
 							if (particles[newIndex].ctype >= 0 && particles[newIndex].ctype < NGOL)
 							{
diff --git a/src/simulation/elements/LIFE.cpp b/src/simulation/elements/LIFE.cpp
index 9394de132..565b99782 100644
--- a/src/simulation/elements/LIFE.cpp
+++ b/src/simulation/elements/LIFE.cpp
@@ -60,8 +60,13 @@ static int graphics(GRAPHICS_FUNC_ARGS)
 	bool renderDeco = !ren->blackDecorations;
 	if (ruleset >= 0 && ruleset < NGOL)
 	{
+		if (!renderDeco)
+		{
+			colour1 = builtinGol[ruleset].colour;
+			colour2 = builtinGol[ruleset].colour2;
+			renderDeco = true;
+		}
 		ruleset = builtinGol[ruleset].ruleset;
-		renderDeco = true;
 	}
 	if (renderDeco)
 	{