Changed unwield_item() to actually unwield the item, and to have it

unwield your weapon rather than something arbitrary (I found no cases
in the code where this wasn't what was wanted.)

Implemented some of David's deck changes:
- decks weigh half as much
- names changed
- Draw Card doesn't cost piety; cost upped to 2 MP
- Nemelex card power bonus now applies even when not praying
- Damnation can now banish extra targets (your own chance of banishment
remains the same.)
- Nemelex doesn't accept sacrificed decks.


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

1 files changed, 5 insertions, 7 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index aad322f3c9..b2506eb227 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -230,11 +230,10 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)
         {
             if (you.equip[EQ_WEAPON] != -1)
             {
-                unwield_item(you.equip[EQ_WEAPON], show_weff_messages);
-                you.turn_is_over = true;
-
-                you.equip[EQ_WEAPON] = -1;
+                unwield_item(show_weff_messages);
                 canned_msg( MSG_EMPTY_HANDED );
+
+                you.turn_is_over = true;
                 you.time_taken *= 3;
                 you.time_taken /= 10;
             }
@@ -257,7 +256,7 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)
 
     // Go ahead and wield the weapon.
     if (you.equip[EQ_WEAPON] != -1)
-        unwield_item(you.equip[EQ_WEAPON], show_weff_messages);
+        unwield_item(show_weff_messages);
 
     you.equip[EQ_WEAPON] = item_slot;
 
@@ -1554,8 +1553,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
     // like temporary branding. -- bwr
     if (throw_2 == you.equip[EQ_WEAPON] && you.inv[throw_2].quantity == 1)
     {
-        unwield_item( throw_2 );
-        you.equip[EQ_WEAPON] = -1;
+        unwield_item();
         canned_msg( MSG_EMPTY_HANDED );
     }