diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-01 10:10:02 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-01 10:10:59 -0600 |
| commit | a0de356f3d007e58152f257212ed13d8b44fdfc0 (patch) | |
| tree | f58fc43277e2f4fcb5f99ef57b51eeeef05a9905 /crawl-ref/source/monplace.cc | |
| parent | 7e8ebade4e8c0001439b89f333174f9443b74eb0 (diff) | |
| download | crawl-ref-a0de356f3d007e58152f257212ed13d8b44fdfc0.tar.gz crawl-ref-a0de356f3d007e58152f257212ed13d8b44fdfc0.zip | |
Move checks for a player or monster's being chaotic into another
convenience function in the actor interface.
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 8f0eed6800..76adfa699b 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -21,8 +21,8 @@ #include "message.h" #include "mon-behv.h" #include "mon-pick.h" -#include "monstuff.h" #include "mon-util.h" +#include "monstuff.h" #include "player.h" #include "random.h" #include "religion.h" @@ -2563,7 +2563,7 @@ bool player_will_anger_monster(monsters *mon, bool *holy, const bool isUnholy = (is_evil_god(you.religion) && mons_is_holy(mon)); const bool isLawful = - (you.religion == GOD_ZIN && mons_is_chaotic(mon)); + (you.religion == GOD_ZIN && mon->is_chaotic()); const bool isAntimagical = (you.religion == GOD_TROG && mons_is_magic_user(mon)); |