From 88018f874ae69eabac5569a25103f0138b9cdbbc Mon Sep 17 00:00:00 2001 From: zelgadis Date: Wed, 30 Jul 2008 00:03:08 +0000 Subject: Merge r6724, Bug 2031257 fix. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6725 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/invent.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 34c1fdbaea..b162e2e739 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1336,6 +1336,12 @@ int prompt_invent_item( const char *prompt, int *const count, operation_types oper ) { + if (!_any_items_to_select(type_expect) && type_expect == OSEL_THROWABLE + && oper == OPER_FIRE && mtype == MT_INVLIST) + { + type_expect = OSEL_ANY; + } + if (!_any_items_to_select(type_expect) && type_expect != OSEL_WIELD && mtype == MT_INVLIST) { -- cgit v1.2.3-54-g00ecf