summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 23:11:59 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 23:11:59 +0000
commitf0a8d0474fd94fc6d623023db3ef403a17cd23cc (patch)
tree1727e1f8a4a27af9180221871fb564ac28a52b8b /crawl-ref/source/directn.cc
parentce1424a5886f907755c36e5e649f20bb412cd810 (diff)
downloadcrawl-ref-f0a8d0474fd94fc6d623023db3ef403a17cd23cc.tar.gz
crawl-ref-f0a8d0474fd94fc6d623023db3ef403a17cd23cc.zip
Use more wrappers, and add more cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5893 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index be41c25177..6e395a802a 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2124,19 +2124,20 @@ static void _describe_monster(const monsters *mon)
if (!mons_is_mimic(mon->type) && mons_behaviour_perceptible(mon))
{
- if (mon->behaviour == BEH_SLEEP)
+ if (mons_is_sleeping(mon))
{
mprf(MSGCH_EXAMINE, "%s appears to be resting.",
mon->pronoun(PRONOUN_CAP).c_str());
}
// Applies to both friendlies and hostiles
- else if (mon->behaviour == BEH_FLEE)
+ else if (mons_is_fleeing(mon))
{
mprf(MSGCH_EXAMINE, "%s is retreating.",
mon->pronoun(PRONOUN_CAP).c_str());
}
// hostile with target != you
- else if (!mons_friendly(mon) && !mons_neutral(mon) && mon->foe != MHITYOU)
+ else if (!mons_friendly(mon) && !mons_neutral(mon)
+ && mon->foe != MHITYOU)
{
// special case: batty monsters get set to BEH_WANDER as
// part of their special behaviour.