summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-10-05 17:00:02 (GMT)
committer Simon <simon@hardwired.org.uk>2010-10-05 17:00:02 (GMT)
commit6627e418b2fd887c7125537930a4c40731d698af (patch)
tree6143b4b080aea21c270a77016070764bd371777a /src
parent8b55113abc319c51d85fd01021f0052ce4f7b8d0 (diff)
downloadpowder-6627e418b2fd887c7125537930a4c40731d698af.zip
powder-6627e418b2fd887c7125537930a4c40731d698af.tar.gz
Fix Powered Clone and Photon bug
Diffstat (limited to 'src')
-rw-r--r--src/powder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c
index 40150b9..12dbe59 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1615,7 +1615,7 @@ void update_particles_i(pixel *vid, int start, int inc)
parts[r>>8].type = PT_FIRE;
parts[r>>8].life = 4;
}
- else if(((r&0xFF)!=PT_CLNE && ptypes[parts[r>>8].type].hardness>(rand()%1000))&&parts[i].life>=50)
+ else if(((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && ptypes[parts[r>>8].type].hardness>(rand()%1000))&&parts[i].life>=50)
{
parts[i].life--;
parts[r>>8].type = PT_NONE;
@@ -2601,7 +2601,7 @@ killed:
if(parts[i].type == PT_PHOT) {
rt = pmap[ny][nx] & 0xFF;
- if(rt==PT_CLNE) {
+ if(rt==PT_CLNE || rt==PT_PCLN) {
lt = pmap[ny][nx] >> 8;
if(!parts[lt].ctype)
parts[lt].ctype = PT_PHOT;