summaryrefslogtreecommitdiff
path: root/src/powder.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-20 21:40:08 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-20 21:40:08 (GMT)
commit79614a97197803c0b8bf9cc9cb5b92047c142f6c (patch)
treefd4b855dc89e83dcc69519fd996fc641ef443aab /src/powder.c
parentfed8b7b2ccce037ccb5c5f098d6ffd2c58c8d523 (diff)
downloadpowder-79614a97197803c0b8bf9cc9cb5b92047c142f6c.zip
powder-79614a97197803c0b8bf9cc9cb5b92047c142f6c.tar.gz
Use eval_move(PT_FIGH, ...) when fighters are checking for obstacles
Also stop fighters being included in the stacking check
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c
index fd01dd6..da715f6 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -2870,8 +2870,8 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but
if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT))
pmap[y][x] = t|(i<<8);
// Count number of particles at each location, for excess stacking check
- // (does not include energy particles or THDR - currently no limit on stacking those)
- if (t!=PT_THDR && t!=PT_EMBR)
+ // (there are a few exceptions, including energy particles - currently no limit on stacking those)
+ if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH)
pmap_count[y][x]++;
}
}