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

fix crash with LIFE, fix compiling with lua (again)

Browse Source
This commit is contained in:
jacob1 2013-12-18 13:40:30 -05:00 committed by mniip
parent f1cbff5d2e
commit 78c89dc62b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ Element_LIFE::Element_LIFE()
//#TPT-Directive ElementHeader Element_LIFE static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_LIFE static int update(UPDATE_FUNC_ARGS)
int Element_LIFE::update(UPDATE_FUNC_ARGS) int Element_LIFE::update(UPDATE_FUNC_ARGS)
{ {
if (parts[i].tmp <= 0) if (parts[i].tmp <= 0 && parts[i].tmp > NGOL)
sim->kill_part(i); sim->kill_part(i);
return 0; return 0;
} }
@ -118,9 +118,13 @@ int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)
pc = PIXRGB(150, 150, 0); pc = PIXRGB(150, 150, 0);
else else
pc = PIXRGB(255, 255, 0); pc = PIXRGB(255, 255, 0);
} else { }
else if (cpart->ctype >= 0 && cpart->ctype < NGOL)
{
pc = Element_GOL_colour[cpart->ctype]; pc = Element_GOL_colour[cpart->ctype];
} }
else
pc = ren->sim->elements[cpart->type].Colour;
*colr = PIXR(pc); *colr = PIXR(pc);
*colg = PIXG(pc); *colg = PIXG(pc);
*colb = PIXB(pc); *colb = PIXB(pc);