summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/invent.h
diff options
context:
space:
mode:
authorPete Hurst <pete@streamuniverse.tv>2013-03-30 02:40:21 +0000
committerPete Hurst <pete@streamuniverse.tv>2013-03-31 05:04:19 +0100
commitbab355256aed893ee730059d95111987b32c3815 (patch)
treee5b65c8db8fea3d90e58c68656d6a8610dd1e2b3 /crawl-ref/source/invent.h
parentcf6489b92a2634108f43c37a11b7d332ec1a76f1 (diff)
downloadcrawl-ref-bab355256aed893ee730059d95111987b32c3815.tar.gz
crawl-ref-bab355256aed893ee730059d95111987b32c3815.zip
Prevent selecting inventory items that cannot be used, including melded items for scrolls
Diffstat (limited to 'crawl-ref/source/invent.h')
-rw-r--r--crawl-ref/source/invent.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/invent.h b/crawl-ref/source/invent.h
index 980946c33e..081ff220ab 100644
--- a/crawl-ref/source/invent.h
+++ b/crawl-ref/source/invent.h
@@ -30,6 +30,7 @@ enum object_selector
OSEL_CURSED_WORN = -14,
OSEL_UNCURSED_WORN_ARMOUR = -15,
OSEL_UNCURSED_WORN_JEWELLERY = -16,
+ OSEL_ANY_UNMELDED = -17,
};
#define SLOT_BARE_HANDS -2
@@ -190,7 +191,8 @@ int prompt_invent_item(const char *prompt,
int excluded_slot = -1,
int *const count = NULL,
operation_types oper = OPER_ANY,
- bool allow_list_known = false);
+ bool allow_list_known = false,
+ bool accept_any = false);
vector<SelItem> select_items(
const vector<const item_def*> &items,