After some thought, for now, remove stupid undead not retaining

alternate weapons.  With monsters::pickup_item(), they always seem to 
get missile weapons over melee weapons, and code in _handle_throw() 
makes all zombies unable to throw or shoot, so, effectively, they'll now 
always use melee and never switch weapons.


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

1 files changed, 1 insertions, 7 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 05fd90a2f7..5b19bb4a44 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -723,13 +723,7 @@ void equip_undead(const coord_def &a, int corps, int monster, int monnum)
             const bool alt_weapon = mon->inv[MSLOT_ALT_WEAPON] != NON_ITEM;
 
             if ((weapon && !alt_weapon) || (!weapon && alt_weapon))
-            {
-                // Stupid undead can't switch between weapons.
-                if (mons_wields_two_weapons(mon) || smart_undead)
-                    mslot = !weapon ? MSLOT_WEAPON : MSLOT_ALT_WEAPON;
-                else
-                    continue;
-            }
+                mslot = !weapon ? MSLOT_WEAPON : MSLOT_ALT_WEAPON;
             else
                 mslot = MSLOT_WEAPON;
             break;