Unify mesmerisation code.

There were several places that had copies of the same code, checking
whether mesmerisation blocked movement to a given target.

The various mesmerisation functions have become methods of player
and were moved into behold.cc.

1 files changed, 2 insertions, 6 deletions

diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 09f3a93c80..ebd07d6fcf 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -2040,7 +2040,7 @@ static void _handle_monster_move(monsters *monster)
             if (mons_cannot_move(monster) || !_monster_move(monster))
                 monster->speed_increment -= non_move_energy;
         }
-        update_beholders(monster);
+        you.update_beholder(monster);
 
         // Reevaluate behaviour, since the monster's surroundings have
         // changed (it may have moved, or died for that matter).  Don't
@@ -2087,11 +2087,7 @@ void handle_monsters()
         if (you.banished)
         {
             // Clear list of mesmerising monsters.
-            if (you.duration[DUR_MESMERISED])
-            {
-                you.mesmerised_by.clear();
-                you.duration[DUR_MESMERISED] = 0;
-            }
+            you.clear_beholders();
             break;
         }
     }