diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-07 12:33:40 +0300 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-07 19:52:53 +1000 |
| commit | 3232b4719ebfaccae12c628b01c6ca37ad38254e (patch) | |
| tree | e95548b672dddc54a27c8fe3124809a82ef0b914 /crawl-ref/source/mon-act.cc | |
| parent | 19c21942c0fd98b8034920f9bebd96bc8a8a5261 (diff) | |
| download | crawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.tar.gz crawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.zip | |
Replace mons_neutral with monsters::neutral.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 32b2b734b5..d83783f537 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -1799,7 +1799,7 @@ static void _handle_monster_move(monsters *monster) { // Keep neutral and charmed monsters from picking up stuff. // Same for friendlies if friendly_pickup is set to "none". - if (!mons_neutral(monster) && !monster->has_ench(ENCH_CHARM) + if (!monster->neutral() && !monster->has_ench(ENCH_CHARM) || (you.religion == GOD_JIYVA && mons_is_slime(monster)) && (!monster->friendly() || you.friendly_pickup != FRIENDLY_PICKUP_NONE)) |