openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Simplify scary logic around inventory item buttons.

Browse Source 
Fix #233
This commit is contained in:
Nat Quayle Nelson
2024-12-01 18:42:28 -06:00
committed by Celtic Minstrel
parent c16807690c
commit 0f5cd51126
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/game/boe.text.cpp
View File

@@ -75,6 +75,7 @@ extern enum_map(eItemButton, bool) item_area_button_active[8];
extern enum_map(ePlayerButton, bool) pc_area_button_active[6]; extern enum_map(ePlayerButton, bool) pc_area_button_active[6];
extern rectangle item_screen_button_rects[9]; extern rectangle item_screen_button_rects[9];
extern std::vector<int> spec_item_array; extern std::vector<int> spec_item_array;
extern bool prime_time();
// combat globals // combat globals
extern short item_bottom_button_active[9]; extern short item_bottom_button_active[9];
extern cUniverse univ; extern cUniverse univ;
@@ -330,28 +331,20 @@ void put_item_screen(eItemWinMode screen_num) {
style.italic = false; style.italic = false;
style.colour = Colours::BLACK; style.colour = Colours::BLACK;
// this is kludgy, awkwark, and has redundant code. Done this way to place_item_graphic(i,item.graphic_num);
// make go faster, and I got lazy. // The info button is harmless and can be useful while shopping, so always show it
if((stat_screen_mode == MODE_SHOP) && place_item_button(3,i,ITEMBTN_INFO);
((is_town()) || (is_out()) || ((is_combat()) && (pc == univ.cur_pc)))) { // place give and drop and use
place_item_graphic(i,item.graphic_num); if((stat_screen_mode == MODE_INVEN) &&
prime_time() && (pc == univ.cur_pc)) {
// place give and drop and use
place_item_button(1,i,ITEMBTN_GIVE);
place_item_button(2,i,ITEMBTN_DROP);
if(item.can_use() && (item.rechargeable ? item.charges > 0 : true)) // place use if can if(item.can_use() && (item.rechargeable ? item.charges > 0 : true)) // place use if can
place_item_button(ITEMBTN_NORM,i); place_item_button(0,i,ITEMBTN_USE);
else place_item_button(ITEMBTN_ALL,i);
} }
else {
place_item_graphic(i,item.graphic_num);
place_item_button(3,i,ITEMBTN_INFO); // info button
if((stat_screen_mode == MODE_INVEN) &&
((is_town()) || (is_out()) || ((is_combat()) && (pc == univ.cur_pc))) && overall_mode != MODE_SHOPPING) { // place give and drop and use
place_item_button(1,i,ITEMBTN_GIVE);
place_item_button(2,i,ITEMBTN_DROP);
if(item.can_use() && (item.rechargeable ? item.charges > 0 : true)) // place use if can
place_item_button(0,i,ITEMBTN_USE);
}
}
if(stat_screen_mode != MODE_INVEN && stat_screen_mode != MODE_SHOP) { if(stat_screen_mode != MODE_INVEN && stat_screen_mode != MODE_SHOP) {
place_buy_button(i,pc,i_num); place_buy_button(i,pc,i_num);