summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-06 19:20:53 +0300
committerRobert Vollmert <rvollmert@gmx.net>2009-11-06 17:29:06 +0100
commitf7274ebf7b56aecaebd2207582ce37879a47b697 (patch)
treed113384575cf10267a14cfec06d245b1bd01f641 /crawl-ref/source/monster.cc
parent298af9dfc8810cf44e808ac91c236a2c1df6b704 (diff)
downloadcrawl-ref-f7274ebf7b56aecaebd2207582ce37879a47b697.tar.gz
crawl-ref-f7274ebf7b56aecaebd2207582ce37879a47b697.zip
Remove mons_friendly_real and mons_wont_attack_real.
They were the same as non-_real functions. Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/monster.cc')
-rw-r--r--crawl-ref/source/monster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index 4d02e431b3..6c584297b3 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -3418,7 +3418,7 @@ int monsters::hurt(const actor *agent, int amount, beam_type flavour,
// jelly).
kill_category whose = (agent == NULL) ? KC_OTHER :
(agent->atype() == ACT_PLAYER) ? KC_YOU :
- mons_friendly_real((monsters*)agent) ? KC_FRIENDLY :
+ mons_friendly((monsters*)agent) ? KC_FRIENDLY :
KC_OTHER;
react_to_damage(amount, flavour, whose);
}
@@ -4985,7 +4985,7 @@ void monsters::scale_hp(int num, int den)
kill_category monsters::kill_alignment() const
{
- return (mons_friendly_real(this) ? KC_FRIENDLY : KC_OTHER);
+ return (mons_friendly(this) ? KC_FRIENDLY : KC_OTHER);
}
bool monsters::sicken(int amount)