From 3232b4719ebfaccae12c628b01c6ca37ad38254e Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Sat, 7 Nov 2009 12:33:40 +0300 Subject: Replace mons_neutral with monsters::neutral. Signed-off-by: Jude Brown --- crawl-ref/source/directn.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/directn.cc') diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 87cda945c4..1152999ce0 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -3123,7 +3123,7 @@ static std::string _get_monster_desc(const monsters *mon) else if (mons_is_fleeing(mon)) text += pronoun + " is retreating.\n"; // hostile with target != you - else if (!mon->friendly() && !mons_neutral(mon) + else if (!mon->friendly() && !mon->neutral() && mon->foe != MHITYOU && !crawl_state.arena_suspended) { // Special case: batty monsters get set to BEH_WANDER as @@ -3135,7 +3135,7 @@ static std::string _get_monster_desc(const monsters *mon) if (mon->attitude == ATT_FRIENDLY) text += pronoun + " is friendly.\n"; - else if (mons_neutral(mon)) // don't differentiate between permanent or not + else if (mon->neutral()) // don't differentiate between permanent or not text += pronoun + " is indifferent to you.\n"; if (mons_is_summoned(mon) && mon->type != MONS_RAKSHASA_FAKE) @@ -3233,7 +3233,7 @@ std::string get_monster_equipment_desc(const monsters *mon, bool full_desc, std::string str = ""; if (mon->friendly()) str = "friendly"; - else if (mons_neutral(mon)) + else if (mon->neutral()) str = "neutral"; if (mons_is_summoned(mon)) -- cgit v1.2.3-54-g00ecf