diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 19:20:53 +0300 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-06 17:29:06 +0100 |
| commit | f7274ebf7b56aecaebd2207582ce37879a47b697 (patch) | |
| tree | d113384575cf10267a14cfec06d245b1bd01f641 /crawl-ref/source/mon-util.cc | |
| parent | 298af9dfc8810cf44e808ac91c236a2c1df6b704 (diff) | |
| download | crawl-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/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 4dc815106d..f071fad698 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1979,11 +1979,6 @@ bool mons_friendly(const monsters *m) return (m->attitude == ATT_FRIENDLY || m->has_ench(ENCH_CHARM)); } -bool mons_friendly_real(const monsters *m) -{ - return (m->attitude == ATT_FRIENDLY || m->has_ench(ENCH_CHARM)); -} - bool mons_neutral(const monsters *m) { return (m->attitude == ATT_NEUTRAL || m->has_ench(ENCH_NEUTRAL) @@ -2011,11 +2006,6 @@ bool mons_wont_attack(const monsters *m) return (mons_friendly(m) || mons_good_neutral(m) || mons_strict_neutral(m)); } -bool mons_wont_attack_real(const monsters *m) -{ - return (mons_friendly_real(m) || mons_good_neutral(m) || mons_strict_neutral(m)); -} - bool mons_att_wont_attack(mon_attitude_type fr) { return (fr == ATT_FRIENDLY || fr == ATT_GOOD_NEUTRAL || fr == ATT_STRICT_NEUTRAL); @@ -2023,7 +2013,7 @@ bool mons_att_wont_attack(mon_attitude_type fr) mon_attitude_type mons_attitude(const monsters *m) { - if (mons_friendly_real(m)) + if (mons_friendly(m)) return ATT_FRIENDLY; else if (mons_good_neutral(m)) return ATT_GOOD_NEUTRAL; |