diff options
author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
---|---|---|
committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
commit | ce5cd1e9df7f220ee7d07b285b76473ec9fb928f (patch) | |
tree | 9f56ef300bc15746c2cde58dcbd09c2df1bdac95 /crawl-ref/source/attitude-change.cc | |
parent | 71b738e8b44d6dad14c29bc898eff2ac700e9e1e (diff) | |
parent | 5efc2ebb172e0046e26e8b4a5114359f2e217628 (diff) | |
download | crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.tar.gz crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.zip |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/Makefile.obj
crawl-ref/source/dbg-scan.cc
crawl-ref/source/decks.cc
crawl-ref/source/describe.cc
crawl-ref/source/directn.cc
crawl-ref/source/evoke.cc
crawl-ref/source/fight.cc
crawl-ref/source/fight.h
crawl-ref/source/ghost.cc
crawl-ref/source/ghost.h
crawl-ref/source/item_use.cc
crawl-ref/source/items.cc
crawl-ref/source/map_knowledge.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-abil.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/monster.cc
crawl-ref/source/monster.h
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/shopping.cc
crawl-ref/source/spl-damage.cc
crawl-ref/source/spl-summoning.cc
crawl-ref/source/spl-transloc.cc
crawl-ref/source/stairs.cc
crawl-ref/source/stuff.cc
crawl-ref/source/tags.cc
crawl-ref/source/traps.cc
crawl-ref/source/xom.cc
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
-rw-r--r-- | crawl-ref/source/attitude-change.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index f9caf5a354..3a8b2cc9ca 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -24,7 +24,6 @@ #include "random.h" #include "religion.h" #include "state.h" -#include "stuff.h" #include "travel.h" #include "transform.h" @@ -172,13 +171,13 @@ bool make_god_gifts_disappear() return (count); } -// When under penance, Yredelemnulites can lose all undead slaves in sight. +// When under penance, Yredelemnulites can lose all nearby undead slaves. bool yred_slaves_abandon_you() { int num_reclaim = 0; int num_slaves = 0; - for (radius_iterator ri(you.pos(), 9); ri; ++ri) + for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri) { monster* mons = monster_at(*ri); if (mons == NULL) @@ -221,7 +220,7 @@ bool yred_slaves_abandon_you() return (false); } -// When under penance, Beoghites can lose all orcish followers in sight, +// When under penance, Beoghites can lose all nearby orcish followers, // subject to a few limitations. bool beogh_followers_abandon_you() { @@ -229,7 +228,7 @@ bool beogh_followers_abandon_you() int num_reconvert = 0; int num_followers = 0; - for (radius_iterator ri(you.pos(), 9); ri; ++ri) + for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri) { monster* mons = monster_at(*ri); if (mons == NULL) |