Fixed some effects being applied twice to damage.

When a deferred_damage_fineff is used, ::hurt is called twice.  Once for
the original target, and a second time for the shared target.  Both
calls would apply effects such as weakening from wretched and QUAD
DAMAGE.  While SIXTEEN TIMES damage is funny, the attacker's effects
should only be applied once.

Now ouch/hurt functions and the deferred_damage_fineff have an
'attacker_effects' parameter, which defaults to true.  If false, then
damage effects from the attacker are assumed to have already been
applied.  All existing uses of deferred_damage_fineff have been
appropriately updated.  Also applied to spectral weapon damage sharing.

1 files changed, 5 insertions, 2 deletions

diff --git a/crawl-ref/source/fineff.h b/crawl-ref/source/fineff.h
index 43e1d34720..f8c2f7ed9a 100644
--- a/crawl-ref/source/fineff.h
+++ b/crawl-ref/source/fineff.h
@@ -124,8 +124,10 @@ protected:
 class deferred_damage_fineff : public final_effect
 {
 public:
-    deferred_damage_fineff(const actor *attack, const actor *defend, int dam)
-        : final_effect(attack, defend, coord_def()), damage(dam)
+    deferred_damage_fineff(const actor *attack, const actor *defend,
+                           int dam, bool _attacker_effects)
+        : final_effect(attack, defend, coord_def()),
+          damage(dam), attacker_effects(_attacker_effects)
     {
     }
     bool mergeable(const final_effect &a) const;
@@ -133,6 +135,7 @@ public:
     void fire();
 protected:
     int damage;
+    bool attacker_effects;
 };
 
 class starcursed_merge_fineff : public final_effect