summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-09 14:33:06 +0300
committerVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-09 14:58:19 +0300
commit9338556ebf846bbc4176134e3846ef6699e8434b (patch)
tree2107949166730a765e3e1e98a66778f112fb5e6a /crawl-ref/source/xom.cc
parentbf03515e22d610f81afa6d4153afc383f7331363 (diff)
downloadcrawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.tar.gz
crawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.zip
Replace mons_wont_attack with monsters::wont_attack.
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 513291e174..5eb31d082b 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1204,7 +1204,7 @@ static int _xom_confuse_monsters(int sever, bool debug = false)
monster = &menv[i];
if (monster->type == MONS_NO_MONSTER || !mons_near(monster)
- || mons_wont_attack(monster)
+ || monster->wont_attack()
|| !mons_class_is_confusable(monster->type)
|| one_chance_in(20))
{
@@ -1425,7 +1425,7 @@ static int _xom_polymorph_nearby_monster(bool helpful, bool debug = false)
: ENCH_SHAPESHIFTER);
}
- const bool powerup = !(mons_wont_attack(mon) ^ helpful);
+ const bool powerup = !(mon->wont_attack() ^ helpful);
monster_polymorph(mon, RANDOM_MONSTER,
powerup ? PPT_MORE : PPT_LESS);
@@ -1552,7 +1552,7 @@ static int _xom_swap_weapons(bool debug = false)
if (!you.see_cell(m->pos()))
continue;
- if (!wpn || mons_wont_attack(m) || m->is_summoned()
+ if (!wpn || m->wont_attack() || m->is_summoned()
|| mons_itemuse(m) < MONUSE_STARTING_EQUIPMENT
|| (m->flags & MF_HARD_RESET))
{
@@ -1752,7 +1752,7 @@ static int _xom_animate_monster_weapon(int sever, bool debug = false)
if (!you.see_cell(m->pos()))
continue;
- if (mons_wont_attack(m) || m->is_summoned()
+ if (m->wont_attack() || m->is_summoned()
|| mons_itemuse(m) < MONUSE_STARTING_EQUIPMENT
|| (m->flags & MF_HARD_RESET))
{
@@ -1926,7 +1926,7 @@ static int _xom_throw_divine_lightning(bool debug = false)
{
if (monsters* mon = monster_at(*ri))
{
- if (!mons_wont_attack(mon))
+ if (!mon->wont_attack())
{
found_hostile = true;
break;