Add a few more poison-related cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7449 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 9e8d112083..b276e85a25 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2371,8 +2371,8 @@ static void _beam_petrifies_monster(bolt &pbolt, monsters *monster)
     }
 }
 
-bool curare_hits_monster(const bolt &beam, monsters *monster,
-                         kill_category who, int levels)
+bool curare_hits_monster(actor *agent, monsters *monster, kill_category who,
+                         int levels)
 {
     poison_monster(monster, who, levels, false);
 
@@ -2391,7 +2391,7 @@ bool curare_hits_monster(const bolt &beam, monsters *monster,
         if (hurted)
         {
             simple_monster_message(monster, " convulses.");
-            monster->hurt(beam.agent(), hurted, BEAM_POISON);
+            monster->hurt(agent, hurted, BEAM_POISON);
         }
 
         if (monster->alive())
@@ -4492,7 +4492,8 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
             else if (item->special == SPMSL_CURARE)
             {
                 if (beam.ench_power == AUTOMATIC_HIT
-                    && curare_hits_monster(beam, mon, _whose_kill(beam), 2)
+                    && curare_hits_monster(beam.agent(),
+                                           mon, _whose_kill(beam), 2)
                     && !mon->alive())
                 {
                     wake_mimic = false;