diff options
| author | DracoOmega <draco_omega@live.com> | 2014-03-10 13:35:24 -0230 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2014-03-11 20:07:57 -0230 |
| commit | e562176b983caf69befba5b63829b8f7163f0d67 (patch) | |
| tree | 765142295a9f4b55383e4ad137a4f3d4b49a2442 /crawl-ref/source/mon-util.cc | |
| parent | 9eb38f968e745d6a47d0f33a805f48ca11995707 (diff) | |
| download | crawl-ref-e562176b983caf69befba5b63829b8f7163f0d67.tar.gz crawl-ref-e562176b983caf69befba5b63829b8f7163f0d67.zip | |
Fix many summoners swapping past their summons
Code that was originally intended to let intelligent undead swap
past zombies so that they could follow you upstairs was now being
applied to all capped summoned creatures (since they also cannot
take stairs). This meant that same-holiness summoners would
displace their summons (and also be even easier to lure upstairs
away from them). The code now checks the monster's type only, and
ignores whether or not it is summoned.
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 32fb1f209d..b99c975861 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -3851,8 +3851,8 @@ bool monster_senior(const monster* m1, const monster* m2, bool fleeing) // push past monsters too stupid to use stairs (so that e.g. non-zombified // or spectral zombified undead can push past non-spectral zombified // undead). - if (m1->holiness() == m2->holiness() && mons_can_use_stairs(m1) - && !mons_can_use_stairs(m2)) + if (m1->holiness() == m2->holiness() && mons_class_can_use_stairs(m1->type) + && !mons_class_can_use_stairs(m2->type)) { return true; } |