diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-03 22:08:36 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-03 22:08:36 (GMT) |
| commit | de6bb6a960f8b02df9c01d9b3cbd5650147b23a0 (patch) | |
| tree | 300d6539ae79230efbb248ead68f982501e7d6ff /src/simulation/Simulation.cpp | |
| parent | 2be0b222111240cca189288a6a6da2141c5a8a2f (diff) | |
| parent | 8b83ae9f95210ab3d540c985f82bc344786c3b85 (diff) | |
| download | powder-de6bb6a960f8b02df9c01d9b3cbd5650147b23a0.zip powder-de6bb6a960f8b02df9c01d9b3cbd5650147b23a0.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index ef3c3d9..409fc4a 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2849,10 +2849,10 @@ int Simulation::create_part(int p, int x, int y, int tv) parts[pmap[y][x]>>8].ctype = t; if (t == PT_LIFE && v < NGOLALT && drawOn != PT_STOR) parts[pmap[y][x]>>8].tmp = v; } - else if (drawOn == PT_DTEC && drawOn != t) + else if ((drawOn == PT_DTEC || (drawOn == PT_PSTN && t != PT_FRME)) && drawOn != t) { parts[pmap[y][x]>>8].ctype = t; - if (t==PT_LIFE && v<NGOLALT) + if (drawOn == PT_DTEC && t==PT_LIFE && v<NGOLALT) parts[pmap[y][x]>>8].tmp = v; } else if (drawOn == PT_CRAY && drawOn != t && drawOn != PT_PSCN && drawOn != PT_INST && drawOn != PT_METL) |