summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-08-09 20:34:51 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-08-09 20:34:51 (GMT)
commit68da8f2647f2722268b63035fc69f4a33eebffec (patch)
treed3d91fae234ccb14927f07cfd384d5c1ce30ddb5 /src
parente100aa56a7ad1ca173ba6ceadea995b19f317f33 (diff)
downloadpowder-68da8f2647f2722268b63035fc69f4a33eebffec.zip
powder-68da8f2647f2722268b63035fc69f4a33eebffec.tar.gz
fix energy particles going in pipe
Diffstat (limited to 'src')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index 817c5f7..b997174 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -2603,7 +2603,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);