diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-23 20:32:37 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-23 20:32:37 +0000 |
commit | 6f00e679d1f90041599c50c3cc86ab4e499c9ba1 (patch) | |
tree | 2e1ceeed3d328f639166d0ca53dddbd6fba6cdcf /crawl-ref/source/player.cc | |
parent | 0b1e914465f3e3f1f4c73f63cf2346c3f2253861 (diff) | |
download | crawl-ref-6f00e679d1f90041599c50c3cc86ab4e499c9ba1.tar.gz crawl-ref-6f00e679d1f90041599c50c3cc86ab4e499c9ba1.zip |
More cleanups and fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6648 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 274cb05794..57da963f84 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -2641,8 +2641,7 @@ void update_beholders(const monsters *mon, bool force) // Is an update even necessary? if (force || !mons_near(mon) || mons_friendly(mon) || mon->submerged() || mon->has_ench(ENCH_CONFUSION) || mons_cannot_move(mon) - || mon->asleep() || silenced(you.x_pos, you.y_pos) - || silenced(mon->x, mon->y)) + || mon->asleep() || silenced(you.pos()) || silenced(mon->pos())) { const std::vector<int> help = you.beheld_by; you.beheld_by.clear(); @@ -5826,7 +5825,7 @@ int player::total_weight() const bool player::cannot_speak() const { - if (silenced(x_pos, y_pos)) + if (silenced(this->pos())) return (true); if (you.cannot_move()) // we allow talking during sleep ;) |