diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-30 13:53:30 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-30 13:53:30 +0000 |
| commit | 0a390f673d1e6a76efc2eef6c23438692bb5270e (patch) | |
| tree | ad38482fe7e379b1fdf03a3fcb3671a2aed10b6b /crawl-ref/source/monstuff.cc | |
| parent | e07b2622e22fa66566f3e18427e2bb2f9012682e (diff) | |
| download | crawl-ref-0a390f673d1e6a76efc2eef6c23438692bb5270e.tar.gz crawl-ref-0a390f673d1e6a76efc2eef6c23438692bb5270e.zip | |
Apply dolorous' patch to fix incorrect handling of nets monsters
leave behind when blinking or teleporting. (Thanks.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3158 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 3c3fcb49b3..7088423fde 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -478,11 +478,8 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) return; if (mons_is_caught(monster)) - { - int net = get_trapping_net(monster->x,monster->y); - if (net != NON_ITEM) - remove_item_stationary(mitm[net]); - } + mons_clear_trapping_net(monster); + // update list of monsters beholding player update_beholders(monster, true); @@ -1346,8 +1343,8 @@ bool monster_blink(monsters *monster) false, false)) return (false); - if (monster->has_ench(ENCH_HELD)) - monster->del_ench(ENCH_HELD, true); + if (mons_is_caught(monster)) + mons_clear_trapping_net(monster); mgrd[monster->x][monster->y] = NON_MONSTER; |