mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-07 00:46:33 +02:00
Code Issues Projects Releases Wiki Activity

Another GOL rendering fix

Browse Source
This commit is contained in:
Tamás Bálint Misius
2020-10-29 17:17:09 +01:00
parent 1369dbc489
commit 88f97ff2ec
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/GameSave.cpp
View File

@@ -1299,7 +1299,7 @@ void GameSave::readOPS(char * data, int dataLength)
} }
break; break;
case PT_LIFE: case PT_LIFE:
if (savedVersion < 95 || minorVersion < 1) if (savedVersion < 96 && !fakeNewerVersion)
{ {
if (particles[newIndex].ctype >= 0 && particles[newIndex].ctype < NGOL) if (particles[newIndex].ctype >= 0 && particles[newIndex].ctype < NGOL)
{ {

7
src/simulation/elements/LIFE.cpp
View File

@@ -60,9 +60,14 @@ static int graphics(GRAPHICS_FUNC_ARGS)
bool renderDeco = !ren->blackDecorations; bool renderDeco = !ren->blackDecorations;
if (ruleset >= 0 && ruleset < NGOL) if (ruleset >= 0 && ruleset < NGOL)
{ {
ruleset = builtinGol[ruleset].ruleset; if (!renderDeco)
{
colour1 = builtinGol[ruleset].colour;
colour2 = builtinGol[ruleset].colour2;
renderDeco = true; renderDeco = true;
} }
ruleset = builtinGol[ruleset].ruleset;
}
if (renderDeco) if (renderDeco)
{ {
auto states = ((ruleset >> 17) & 0xF) + 2; auto states = ((ruleset >> 17) & 0xF) + 2;