diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 00:03:08 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 00:03:08 +0000 |
| commit | 88018f874ae69eabac5569a25103f0138b9cdbbc (patch) | |
| tree | 910bda6c42baee47d47b14c47128a805135154a4 | |
| parent | 589bc4848e88ad8ede07536302f4ed502d05cffe (diff) | |
| download | crawl-ref-88018f874ae69eabac5569a25103f0138b9cdbbc.tar.gz crawl-ref-88018f874ae69eabac5569a25103f0138b9cdbbc.zip | |
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
| -rw-r--r-- | crawl-ref/source/invent.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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) { |