diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2013-09-08 16:32:25 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2013-09-08 16:33:12 (GMT) |
| commit | 2e52e209a66335cece95e58f98141e1ba30a14aa (patch) | |
| tree | aba6eb1da8362abb945fd641e4967a80ebea22f8 /src | |
| parent | 45dc8ac7572a920fb60ce032e0acbded5dc33a7e (diff) | |
| download | powder-2e52e209a66335cece95e58f98141e1ba30a14aa.zip powder-2e52e209a66335cece95e58f98141e1ba30a14aa.tar.gz | |
CRAY: only set decoration colour after passing through FILT
Diffstat (limited to 'src')
| -rw-r--r-- | src/simulation/Simulation.cpp | 5 | ||||
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 03c4dd2..92be515 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -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) diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index b906c33..002ed28 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -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; |