diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 12:49:55 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 12:49:55 +0100 |
| commit | 421ef9076d48db86629d1acea85d1f5c8e9747b0 (patch) | |
| tree | 4ae1e841b72c73aa67737afd24a2860a28fee2d8 | |
| parent | ae60902e58ad7c146ff5a8a072f6f99022c010ab (diff) | |
| download | crawl-ref-421ef9076d48db86629d1acea85d1f5c8e9747b0.tar.gz crawl-ref-421ef9076d48db86629d1acea85d1f5c8e9747b0.zip | |
Make folks pacified via Evilyon neutral-hostile (dpeg).
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells1.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 00d3ca9986..9420d1d78c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2142,10 +2142,10 @@ void mons_stop_fleeing_from_sanctuary(monsters *monster) behaviour_event(monster, ME_EVAL, MHITYOU); } -void mons_pacify(monsters *mon) +void mons_pacify(monsters *mon, mon_attitude_type att) { // Make the monster permanently neutral. - mon->attitude = ATT_GOOD_NEUTRAL; + mon->attitude = att; mon->flags |= MF_WAS_NEUTRAL; if (!testbits(mon->flags, MF_GOT_HALF_XP) && !mon->is_summoned()) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index bb36b38df7..7858c51167 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -582,7 +582,7 @@ monster_type random_draconian_monster_species(); void define_monster(int midx); void define_monster(monsters &mons); -void mons_pacify(monsters *mon); +void mons_pacify(monsters *mon, mon_attitude_type att = ATT_GOOD_NEUTRAL); bool mons_should_fire(struct bolt &beam); diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index c1d4b40057..af80900803 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -839,7 +839,7 @@ static int _healing_spell(int healed, bool divine_ability, else { simple_monster_message(monster, " turns neutral."); - mons_pacify(monster); + mons_pacify(monster, ATT_NEUTRAL); // Give a small piety return. if (pgain > 0) |