summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_item.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-06-09 02:50:33 +0200
committerAdam Borowski <kilobyte@angband.pl>2011-06-09 02:50:33 +0200
commite1fc118c82585937511dc40843db12704c468627 (patch)
tree6ddc6821b621845603fdd457bc17aa6014491997 /crawl-ref/source/l_item.cc
parent8b9cc337616cc306c1cd54729603848dd2ee97a0 (diff)
parent6ae1cd1c340e54d19208de51f9596a25b5e90e9f (diff)
downloadcrawl-ref-e1fc118c82585937511dc40843db12704c468627.tar.gz
crawl-ref-e1fc118c82585937511dc40843db12704c468627.zip
Merge branch 'octopodes'
Diffstat (limited to 'crawl-ref/source/l_item.cc')
-rw-r--r--crawl-ref/source/l_item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc
index 91d6172333..fb292ccfd1 100644
--- a/crawl-ref/source/l_item.cc
+++ b/crawl-ref/source/l_item.cc
@@ -173,7 +173,7 @@ static int l_item_do_remove(lua_State *ls)
bool result = false;
if (eq == EQ_WEAPON)
result = wield_weapon(true, SLOT_BARE_HANDS);
- else if (eq == EQ_LEFT_RING || eq == EQ_RIGHT_RING || eq == EQ_AMULET)
+ else if (eq >= EQ_LEFT_RING && eq < NUM_EQUIP)
result = remove_ring(item->link);
else
result = takeoff_armour(item->link);