summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-20 13:26:08 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-20 13:26:08 (GMT)
commit9c599a7b9f4e5d99e8b0e32bf2fdc6c4177fc09d (patch)
tree5a2075797dc8b8313d5b2eb6b8bd3fcccca91051 /src/simulation/Simulation.cpp
parent5ea1889e819e270d68a99d6d8179f8a42e9e5dfc (diff)
downloadpowder-9c599a7b9f4e5d99e8b0e32bf2fdc6c4177fc09d.zip
powder-9c599a7b9f4e5d99e8b0e32bf2fdc6c4177fc09d.tar.gz
TPT: fix enegery particles going into PIPE
Diffstat (limited to 'src/simulation/Simulation.cpp')
-rw-r--r--src/simulation/Simulation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 88dcc9e..50d4cb5 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4018,7 +4018,7 @@ killed:
{
parts[r>>8].tmp = (parts[r>>8].tmp&~0xFF) | parts[i].type;
parts[r>>8].temp = parts[i].temp;
- parts[r>>8].flags = parts[i].life;
+ parts[r>>8].tmp2 = parts[i].life;
parts[r>>8].pavg[0] = parts[i].tmp;
parts[r>>8].pavg[1] = parts[i].ctype;
kill_part(i);