summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-29 02:10:18 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-29 02:10:18 +0000
commit384d1e986bf2868bd6f694c695519aefe733e3a3 (patch)
treecde2553d5b6c491bb04d6729520e780fdf087619 /crawl-ref/source/monstuff.cc
parentc4f5e14829647ea6d000b9cc9e5553579c0db929 (diff)
downloadcrawl-ref-384d1e986bf2868bd6f694c695519aefe733e3a3.tar.gz
crawl-ref-384d1e986bf2868bd6f694c695519aefe733e3a3.zip
Remove erroneous routine for faking pacified monsters' falls through
shaft traps. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6195 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index e28f9d28e0..0607951151 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -5998,16 +5998,6 @@ static void _handle_monster_move(int i, monsters *monster)
if (!mons_is_caught(monster))
{
- // If a pacified monster is leaving the level via a trap,
- // and is about to reach its goal, handle it here.
- if (mons_is_pacified(monster)
- && monster->x + mmov_x == monster->target_x
- && monster->y + mmov_y == monster->target_y)
- {
- make_mons_leave_level(monster);
- break;
- }
-
// See if we move into (and fight) an unfriendly monster.
int targmon = mgrd[monster->x + mmov_x][monster->y + mmov_y];
if (targmon != NON_MONSTER