summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fearmonger.cc
diff options
context:
space:
mode:
authorpubby <pubby8@gmail.com>2013-06-30 14:01:58 -0500
committerNeil Moore <neil@s-z.org>2013-06-30 18:49:12 -0400
commitfaf8416790ef3e910264d7ef83a243078e933cb2 (patch)
treed5d6e74dbad7fd7ab61e0c793b370cb9f5c46540 /crawl-ref/source/fearmonger.cc
parent3dbd8d124c34f4fcf6db89c28bbeb6d6ed53b8c8 (diff)
downloadcrawl-ref-faf8416790ef3e910264d7ef83a243078e933cb2.tar.gz
crawl-ref-faf8416790ef3e910264d7ef83a243078e933cb2.zip
Remove use of 'you' inside player member functions
'you' seemed to be pointless in such context anyways, and lead to some const correctness bugs since '*this' could have a different const-ness from 'you'.
Diffstat (limited to 'crawl-ref/source/fearmonger.cc')
-rw-r--r--crawl-ref/source/fearmonger.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/fearmonger.cc b/crawl-ref/source/fearmonger.cc
index 9bf3373c1e..fa08a933b2 100644
--- a/crawl-ref/source/fearmonger.cc
+++ b/crawl-ref/source/fearmonger.cc
@@ -18,9 +18,9 @@
// Add a monster to the list of fearmongers.
bool player::add_fearmonger(const monster* mon)
{
- if (is_sanctuary(you.pos()))
+ if (is_sanctuary(pos()))
{
- if (you.can_see(mon))
+ if (can_see(mon))
{
mprf("%s's aura of fear is muted, and has no effect on you.",
mon->name(DESC_THE).c_str());
@@ -33,14 +33,14 @@ bool player::add_fearmonger(const monster* mon)
if (!duration[DUR_AFRAID])
{
- you.set_duration(DUR_AFRAID, 7, 12);
+ set_duration(DUR_AFRAID, 7, 12);
fearmongers.push_back(mon->mindex());
mprf(MSGCH_WARN, "You are terrified of %s!",
mon->name(DESC_THE).c_str());
}
else
{
- you.increase_duration(DUR_AFRAID, 5, 12);
+ increase_duration(DUR_AFRAID, 5, 12);
if (!afraid_of(mon))
fearmongers.push_back(mon->mindex());
}
@@ -187,5 +187,5 @@ bool player::_possible_fearmonger(const monster* mon) const
&& !mon->asleep() && !mon->cannot_move()
&& !mon->wont_attack() && !mon->pacified()
&& !mon->berserk() && !mons_is_fleeing(mon)
- && !is_sanctuary(you.pos()));
+ && !is_sanctuary(pos()));
}