diff options
| author | Ed Gonzalez <ed.gonzalez3@gmail.com> | 2013-06-29 02:19:54 -0700 |
|---|---|---|
| committer | Pete Hurst <pete@streamuniverse.tv> | 2013-06-29 13:06:29 +0100 |
| commit | 6382b9ac15e1efb947f2d8b4960795e0de283172 (patch) | |
| tree | c4ab67cdd61910178bc479d321428acecbd4acb2 /crawl-ref/source/fineff.cc | |
| parent | 57ea70d0b762d66f74456407b6c816e68cba40a5 (diff) | |
| download | crawl-ref-6382b9ac15e1efb947f2d8b4960795e0de283172.tar.gz crawl-ref-6382b9ac15e1efb947f2d8b4960795e0de283172.zip | |
Fixed issue with merging deferred_damage_fineff.
Merging now checks that both have the same state for attacker_effects.
Diffstat (limited to 'crawl-ref/source/fineff.cc')
| -rw-r--r-- | crawl-ref/source/fineff.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc index f62a84f573..957ef47a46 100644 --- a/crawl-ref/source/fineff.cc +++ b/crawl-ref/source/fineff.cc @@ -84,7 +84,8 @@ bool blood_fineff::mergeable(const final_effect &fe) const bool deferred_damage_fineff::mergeable(const final_effect &fe) const { const deferred_damage_fineff *o = dynamic_cast<const deferred_damage_fineff *>(&fe); - return o && att == o->att && def == o->def; + return o && att == o->att && def == o->def + && attacker_effects == o->attacker_effects; } bool starcursed_merge_fineff::mergeable(const final_effect &fe) const |