matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix built-in GOL types

Browse Source
This commit is contained in:
Tamás Bálint Misius 2020-10-12 17:36:24 +02:00
parent f57d503b41
commit 5a5eace691
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,16 +84,19 @@ static int graphics(GRAPHICS_FUNC_ARGS)
static void create(ELEMENT_CREATE_FUNC_ARGS) static void create(ELEMENT_CREATE_FUNC_ARGS)
{ {
sim->parts[i].ctype = v & 0x1FFFFF; // * 0x200000: No need to look for colours, they'll be set later anyway.
bool skipLookup = v & 0x200000;
v &= 0x1FFFFF;
sim->parts[i].ctype = v;
if (v < NGOL) if (v < NGOL)
{ {
sim->parts[i].dcolour = builtinGol[v].colour; sim->parts[i].dcolour = builtinGol[v].colour;
sim->parts[i].tmp = builtinGol[v].colour2; sim->parts[i].tmp = builtinGol[v].colour2;
v = builtinGol[v].ruleset; v = builtinGol[v].ruleset;
} }
else if (!(v & 0x200000)) // * 0x200000: No need to look for colours, they'll be set later anyway. else if (!skipLookup)
{ {
auto *cgol = sim->GetCustomGOLByRule(v & 0x1FFFFF); auto *cgol = sim->GetCustomGOLByRule(v);
if (cgol) if (cgol)
{ {
sim->parts[i].dcolour = cgol->colour1; sim->parts[i].dcolour = cgol->colour1;