From 918cab578ab18e1ed47b89e8bed1bd07bc795542 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Thu, 30 Nov 2006 10:38:01 +0000 Subject: [1605400] Fixed inability to wield stuff when carrying no weapons. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@531 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/item_use.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/item_use.cc') diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d98c6369b6..a6a65af1fd 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -177,7 +177,8 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages) return (false); } - // Any general reasons why we can't wield a new object? + // Look for conditions like berserking that could prevent wielding + // weapons. if (!can_wield(NULL, true)) return (false); @@ -201,8 +202,8 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages) && you.inv[item_slot].base_type != OBJ_MISSILES && you.inv[item_slot].base_type != OBJ_STAVES; - // Prompt if not using the auto swap command, - // or if the swap slot is empty. + // Prompt if not using the auto swap command, or if the swap slot + // is empty. if (!auto_wield || !is_valid_item(you.inv[item_slot]) || force_unwield) { if (!auto_wield) -- cgit v1.2.3-54-g00ecf