Don't arc electricity when attacking with an elec weapon in water

The main thing it did was cause annoying prompts when you could hit
yourself or an ally with the arc. It was rarely relevant other than that,
and just made elec brand a bit more complicated unnecessarily.

1 files changed, 0 insertions, 13 deletions

diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc
index da18eeac0e..61c1af8a99 100644
--- a/crawl-ref/source/fineff.cc
+++ b/crawl-ref/source/fineff.cc
@@ -36,12 +36,6 @@ void final_effect::schedule()
     env.final_effects.push_back(this);
 }
 
-bool lightning_fineff::mergeable(const final_effect &fe) const
-{
-    const lightning_fineff *o = dynamic_cast<const lightning_fineff *>(&fe);
-    return o && att == o->att && posn == o->posn;
-}
-
 bool mirror_damage_fineff::mergeable(const final_effect &fe) const
 {
     const mirror_damage_fineff *o =
@@ -140,13 +134,6 @@ void deferred_damage_fineff::merge(const final_effect &fe)
     damage += ddamfe->damage;
 }
 
-void lightning_fineff::fire()
-{
-    if (you.see_cell(posn))
-        mpr("Electricity arcs through the water!");
-    conduct_electricity(posn, attacker());
-}
-
 void mirror_damage_fineff::fire()
 {
     actor *attack = attacker();