From 09f847585f244346c60afad2d7d3069ab20236cf Mon Sep 17 00:00:00 2001 From: ALONSO Laurent Date: Sat, 9 Oct 2021 15:54:00 +0200 Subject: [PATCH] talk/shop: try to remove uneeded item's drop/give/use icons... --- src/game/boe.dlgutil.cpp | 3 ++- src/game/boe.text.cpp | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/game/boe.dlgutil.cpp b/src/game/boe.dlgutil.cpp index fe3f5758..e1e2f7ec 100644 --- a/src/game/boe.dlgutil.cpp +++ b/src/game/boe.dlgutil.cpp @@ -865,7 +865,8 @@ void handle_talk_event(location p) { save_talk_str2 = univ.town.cur_talk().talk_nodes[which_talk_entry].str2; can_save_talk = true; - + stat_screen_mode = MODE_SHOP; + switch(ttype) { case eTalkNode::REGULAR: break; diff --git a/src/game/boe.text.cpp b/src/game/boe.text.cpp index f84e00ff..35f1e8dd 100644 --- a/src/game/boe.text.cpp +++ b/src/game/boe.text.cpp @@ -331,14 +331,9 @@ void put_item_screen(eItemWinMode screen_num) { style.italic = false; style.colour = Colours::BLACK; - // this is kludgy, awkwark, and has redundant code. Done this way to - // make go faster, and I got lazy. - if((stat_screen_mode == MODE_SHOP) && - ((is_town()) || (is_out()) || ((is_combat()) && (pc == univ.cur_pc)))) { // place give and drop and use + if(stat_screen_mode == MODE_SHOP && !is_combat()) { // place give and drop and use place_item_graphic(i,item.graphic_num); - if(item.can_use()) // place use if can - place_item_button(ITEMBTN_NORM,i); - else place_item_button(ITEMBTN_ALL,i); + place_item_button(3,i,ITEMBTN_INFO); // info button } else { place_item_graphic(i,item.graphic_num);