summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2011-08-16 16:46:45 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2011-08-16 16:46:45 (GMT)
commite7ce51d420d30ee6ab82df8e7dbbe791401f33e9 (patch)
tree5ca7e2e010bd80dd47708954de17f43553ecee94 /src
parentad09f3040e7e08bbe2d5b256a2933d148a2a8e3d (diff)
downloadpowder-e7ce51d420d30ee6ab82df8e7dbbe791401f33e9.zip
powder-e7ce51d420d30ee6ab82df8e7dbbe791401f33e9.tar.gz
Revert "Fixed a bug with clne having its ctype overridden by manually placed particles."
This reverts commit ed392c9724878fc39fe5cbba2f882dacf7278979. Sorry about the reverts, I accedentally reverted the wrong one originally.
Diffstat (limited to 'src')
-rw-r--r--src/powder.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/powder.c b/src/powder.c
index b24960f..595132b 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -757,11 +757,8 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
t!=PT_STKM2&&t!=PT_PBCN)
)
{
- if(!parts[pmap[y][x]>>8].ctype){
- parts[pmap[y][x]>>8].ctype = t;
- if (t==PT_LIFE && v<NGOLALT)
- parts[pmap[y][x]>>8].tmp = v;
- }
+ parts[pmap[y][x]>>8].ctype = t;
+ if (t==PT_LIFE && v<NGOLALT) parts[pmap[y][x]>>8].tmp = v;
}
return -1;
}