diff options
| author | Neil Moore <neil@s-z.org> | 2012-09-09 20:29:01 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-09-09 20:30:00 -0400 |
| commit | 81a91909757955353d0db3d436589ff2f7e43a07 (patch) | |
| tree | be47747bac4a1ec1dee8b47b0fded50cb8196d13 /crawl-ref/source/fineff.cc | |
| parent | f64b91e62dafb06f0263a8241911f0126c2fc0e5 (diff) | |
| download | crawl-ref-81a91909757955353d0db3d436589ff2f7e43a07.tar.gz crawl-ref-81a91909757955353d0db3d436589ff2f7e43a07.zip | |
Fix a few fineff mergeability checks.
Diffstat (limited to 'crawl-ref/source/fineff.cc')
| -rw-r--r-- | crawl-ref/source/fineff.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc index 4428bc8a5a..60f4d2bec2 100644 --- a/crawl-ref/source/fineff.cc +++ b/crawl-ref/source/fineff.cc @@ -44,7 +44,7 @@ bool mirror_damage_fineff::mergeable(const final_effect &fe) const { const mirror_damage_fineff *o = dynamic_cast<const mirror_damage_fineff *>(&fe); - return o && att == o->att && def == o->def && posn == o->posn; + return o && att == o->att && def == o->def; } bool trample_follow_fineff::mergeable(const final_effect &fe) const @@ -76,7 +76,7 @@ bool trj_spawn_fineff::mergeable(const final_effect &fe) const bool blood_fineff::mergeable(const final_effect &fe) const { const blood_fineff *o = dynamic_cast<const blood_fineff *>(&fe); - return o && posn == o->posn; + return o && posn == o->posn && mtype == o->mtype; } |