diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 16:05:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 16:05:44 +0000 |
| commit | b12a108002cb863403661dda46e3471449d328d4 (patch) | |
| tree | 1c3df9ed984256d2ffc8fef43111943a552c7e1e /crawl-ref/source/spells1.cc | |
| parent | 363109b68d101ab85cbedb552a22d55ee4251a70 (diff) | |
| download | crawl-ref-b12a108002cb863403661dda46e3471449d328d4.tar.gz crawl-ref-b12a108002cb863403661dda46e3471449d328d4.zip | |
And properly consolidate monster hostility checks.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9624 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 667a75d649..102eb0cbf7 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -731,7 +731,7 @@ static int _healing_spell(int healed, bool divine_ability, } const bool can_pacify = _can_pacify_monster(monster, healed); - const bool was_hostile = _mons_hostile(monster); + const bool is_hostile = _mons_hostile(monster); // Don't divinely heal a monster you can't pacify. if (divine_ability @@ -746,7 +746,7 @@ static int _healing_spell(int healed, bool divine_ability, if (you.religion == GOD_ELYVILON && can_pacify - && _mons_hostile(monster)) + && is_hostile) { did_something = true; simple_god_message(" supports your offer of peace."); @@ -776,7 +776,7 @@ static int _healing_spell(int healed, bool divine_ability, else print_wounds(monster); - if (you.religion == GOD_ELYVILON && !was_hostile) + if (you.religion == GOD_ELYVILON && !is_hostile) { simple_god_message(" appreciates your healing of a fellow " "creature."); |