Fix 1996770: shafts being capable of disarming.

Fix 1996304: the Swap card incorrectly swapping monsters/player caught in a net


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5941 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1 insertions, 40 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 95a53a14ad..d738cf66c8 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1626,46 +1626,7 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
         seen_monster(monster);
 
     if (old_mon_caught)
-    {
-        if (monster->body_size(PSIZE_BODY) >= SIZE_GIANT)
-        {
-            int net = get_trapping_net(monster->x, monster->y);
-            if (net != NON_ITEM)
-                destroy_item(net);
-
-            if (see_grid(monster->x, monster->y))
-            {
-                if (player_monster_visible(monster))
-                {
-                    mprf("The net rips apart, and %s comes free!",
-                         monster->name(DESC_NOCAP_THE).c_str());
-                }
-                else
-                    mpr("All of a sudden the net rips apart!");
-            }
-        }
-        else if (mons_is_insubstantial(monster->type)
-                 || monster->type == MONS_OOZE
-                 || monster->type == MONS_PULSATING_LUMP)
-        {
-            const int net = get_trapping_net(monster->x, monster->y);
-            if (net != NON_ITEM)
-                remove_item_stationary(mitm[net]);
-
-            if (mons_is_insubstantial(monster->type))
-            {
-                simple_monster_message(monster,
-                                       " drifts right through the net!");
-            }
-            else
-            {
-                simple_monster_message(monster,
-                                       " oozes right through the net!");
-            }
-        }
-        else
-            monster->add_ench(ENCH_HELD);
-    }
+        check_net_will_hold_monster(monster);
 
     player_angers_monster(monster);