diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-18 11:37:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-18 11:37:24 +0000 |
| commit | 5c1d15b2a0ba16caafbc5f426541386776e6ad70 (patch) | |
| tree | 340d1ea4b5fb4d28b3578dbb3257eca03714b2e9 /crawl-ref/source/invent.cc | |
| parent | a7c16941b77fcdcc841c3edbcd0514c16ac4c2e5 (diff) | |
| download | crawl-ref-5c1d15b2a0ba16caafbc5f426541386776e6ad70.tar.gz crawl-ref-5c1d15b2a0ba16caafbc5f426541386776e6ad70.zip | |
Fix 1945337: Vampires getting carnivorous/herbivorous mutations.
Fix 1944345: Dropping worn/wielded items while Berserk.
Fix 1945347: Drinking from fountans while Berserk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4326 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/invent.cc')
| -rw-r--r-- | crawl-ref/source/invent.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index f232e5374c..31c4c09e11 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -628,8 +628,8 @@ std::vector<SelItem> InvMenu::get_selitems() const bool InvMenu::process_key( int key ) { if (items.size() - && type == MT_DROP - && (key == CONTROL('D') || key == '@')) + && type == MT_DROP + && (key == CONTROL('D') || key == '@')) { int newflag = is_set(MF_MULTISELECT)? @@ -954,6 +954,7 @@ std::vector<SelItem> prompt_invent_items( && (!pre_select || pre_select->empty())? MF_SINGLESELECT | MF_EASY_EXIT | MF_ANYPRINTABLE : MF_MULTISELECT | MF_ALLOW_FILTER; + // The "view inventory listing" mode. int ch = invent_select( prompt, |