diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-28 23:07:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-28 23:07:05 +0000 |
| commit | 5331993d1a4db1a03e36a6860edcad756213973b (patch) | |
| tree | c86a58fc1ba3582d0975ff0f5c42a7151445c918 /crawl-ref/source/invent.cc | |
| parent | fde21eb9a22782da835911ea2a0d3b70836a81a5 (diff) | |
| download | crawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.tar.gz crawl-ref-5331993d1a4db1a03e36a6860edcad756213973b.zip | |
* Add icons for weapon brands, mostly borrowing from potions/wands and
with a few new creations. :)
* Move tiles for unrandarts and fixedarts into artefact/ subfolders.
* Move the Knife of Accuracy into the unrandart list.
* Add a lab vault containing a hungry ghost (maybe should be rarer).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7680 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/invent.cc')
| -rw-r--r-- | crawl-ref/source/invent.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index b972967274..7543eac61b 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -671,10 +671,8 @@ bool InvMenu::process_key( int key ) && type == MT_DROP && (key == CONTROL('D') || key == '@')) { - int newflag = - is_set(MF_MULTISELECT)? - MF_SINGLESELECT | MF_ANYPRINTABLE - : MF_MULTISELECT; + int newflag = is_set(MF_MULTISELECT) ? MF_SINGLESELECT | MF_ANYPRINTABLE + : MF_MULTISELECT; flags &= ~(MF_SINGLESELECT | MF_MULTISELECT | MF_ANYPRINTABLE); flags |= newflag; @@ -789,8 +787,10 @@ std::vector<SelItem> select_items( const std::vector<const item_def*> &items, if (mtype == MT_PICKUP) menu.set_tag("pickup"); menu.load_items(items); - menu.set_flags(noselect ? MF_NOSELECT | MF_SHOW_PAGENUMBERS : - MF_MULTISELECT | MF_ALLOW_FILTER | MF_SHOW_PAGENUMBERS); + int new_flags = noselect ? MF_NOSELECT + : MF_MULTISELECT | MF_ALLOW_FILTER; + new_flags |= MF_SHOW_PAGENUMBERS; + menu.set_flags(new_flags); menu.show(); selected = menu.get_selitems(); } @@ -1041,9 +1041,8 @@ std::vector<SelItem> prompt_invent_items( } else if (keyin == '?' || keyin == '*' || keyin == ',') { - int selmode = - Options.drop_mode == DM_SINGLE - && (!pre_select || pre_select->empty())? + int selmode = Options.drop_mode == DM_SINGLE + && (!pre_select || pre_select->empty()) ? MF_SINGLESELECT | MF_EASY_EXIT | MF_ANYPRINTABLE : MF_MULTISELECT | MF_ALLOW_FILTER; |