diff options
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/decks.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/invent.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/itemname.cc | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index e0cc7e3538..f9c123c31c 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1192,7 +1192,7 @@ void process_command( command_type cmd ) break; case CMD_DISPLAY_INVENTORY: - get_invent(-1); + get_invent(OSEL_ANY); break; case CMD_EVOKE: diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 39d28626e3..835c757303 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -775,6 +775,7 @@ static void helm_card(int power, deck_rarity_type rarity) // wield the deck in order to evoke it! static void blade_card(int power, deck_rarity_type rarity) { + // not yet implemented return; const int power_level = get_power_level(power, rarity); if ( power_level >= 2 ) diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 2db3364076..8619660b83 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -29,6 +29,7 @@ #include "externs.h" #include "clua.h" +#include "describe.h" #include "itemprop.h" #include "items.h" #include "macro.h" @@ -526,9 +527,16 @@ bool in_inventory( const item_def &i ) unsigned char get_invent( int invent_type ) { - unsigned char nothing = invent_select(NULL, MT_INVLIST, invent_type); + unsigned char select = invent_select(NULL, MT_INVLIST, invent_type, + MF_SINGLESELECT); + if ( isalpha(select) ) + { + const int invidx = letter_to_index(select); + if ( is_valid_item(you.inv[invidx]) ) + describe_item( you.inv[invidx] ); + } redraw_screen(); - return (nothing); + return select; } // end get_invent() std::string item_class_name( int type, bool terse ) diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 172b677bfd..be82ce922b 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1503,7 +1503,7 @@ bool item_type_known( const item_def &item ) return (true); const item_type_id_type idt = objtype_to_idtype(item.base_type); - if ( idt != NUM_IDTYPE ) + if ( idt != NUM_IDTYPE && item.sub_type < 50 ) return ( type_ids[idt][item.sub_type] == ID_KNOWN_TYPE ); else return false; |