More cleanups and fixes.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc
index de5db2b641..d5795abeb7 100644
--- a/crawl-ref/source/monspeak.cc
+++ b/crawl-ref/source/monspeak.cc
@@ -222,7 +222,7 @@ bool mons_speaks(const monsters *monster)
     // unless they're normally silent (S_SILENT).  Use
     // get_monster_data(monster->type) to bypass mon_shouts()
     // replacing S_RANDOM with a random value.
-    if (silenced(monster->x, monster->y)
+    if (silenced(monster->pos())
         && get_monster_data(monster->type)->shouts != S_SILENT)
     {
         if (!one_chance_in(3))
@@ -258,8 +258,8 @@ bool mons_speaks(const monsters *monster)
     if (mons_is_fleeing(monster))
         prefixes.push_back("fleeing");
 
-    bool silence = silenced(you.x_pos, you.y_pos);
-    if (silenced(monster->x, monster->y))
+    bool silence = silenced(you.pos());
+    if (silenced(monster->pos()))
     {
         silence = true;
         prefixes.push_back("silenced");