summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-09 15:15:24 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-09 15:15:24 (GMT)
commita6ee8e2af156e42fa3b5311afa4d3144d1566ca0 (patch)
treebbce220a130671a58991f5f193355fc244200803 /src/simulation/Simulation.cpp
parent9a25fb741cab098f0ec01d03373ab2db6c7b518d (diff)
downloadpowder-a6ee8e2af156e42fa3b5311afa4d3144d1566ca0.zip
powder-a6ee8e2af156e42fa3b5311afa4d3144d1566ca0.tar.gz
fix NEUT created from DEUT explosions sometimes having the deco color of previous particles. Also allow the deco editor to color energy particles instead
Diffstat (limited to 'src/simulation/Simulation.cpp')
-rw-r--r--src/simulation/Simulation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 6fea6de..c420f3b 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -924,6 +924,8 @@ void Simulation::ApplyDecoration(int x, int y, int colR_, int colG_, int colB_,
float strength = 0.01f;
rp = pmap[y][x];
if (!rp)
+ rp = photons[y][x];
+ if (!rp)
return;
ta = (parts[rp>>8].dcolour>>24)&0xFF;