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

CRAY: only set decoration colour after passing through FILT

Browse Source
This commit is contained in:
jacksonmj 2013-09-08 17:32:25 +01:00
parent 45dc8ac757
commit 2e52e209a6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/simulation/Simulation.cpp
View File

@ -2689,6 +2689,11 @@ int Simulation::create_part(int p, int x, int y, int tv)
parts[index].ctype = PT_DUST;
return index;
}
if (p==-2 && ((elements[type].Properties & PROP_DRAWONCTYPE) || type==PT_CRAY))
{
parts[index].ctype = PT_SPRK;
return -1;
}
if (!(type == PT_INST || (elements[type].Properties&PROP_CONDUCTS)) || parts[index].life!=0)
return -1;
if (p == -2 && type == PT_INST)

3
src/simulation/elements/CRAY.cpp
View File

@ -96,7 +96,8 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
else
nr = sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, parts[i].ctype);
if (nr!=-1) {
parts[nr].dcolour = colored;
if (colored)
parts[nr].dcolour = colored;
parts[nr].temp = parts[i].temp;
if(!--partsRemaining)
docontinue = 0;