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

Show charges for unidentified ammunition. Fix #718

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-04-09 11:35:34 -05:00
parent 3e1c2a9fb1
commit f0eabd3aeb
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,13 +326,25 @@ void put_item_screen(eItemWinMode screen_num) {
} else style.colour = Colours::BLACK;
sout.str("");
if(!item.ident)
sout << item.name << " ";
else { /// Don't place # of charges when Sell button up and space tight
if(item.ident)
sout << item.full_name << ' ';
if(item.charges > 0 && item.ability != eItemAbil::MESSAGE && (stat_screen_mode == MODE_INVEN || stat_screen_mode == MODE_SHOP))
sout << '(' << int(item.charges) << ')';
else
sout << item.name << " ";
// Charges:
bool show_charges = item.max_charges > 0;
// Show charges for unidentified ammunition, but not other items
if(item.missile <= 0)
show_charges &= item.ident;
// Don't show charges if it just shows a dialog
show_charges &= item.ability != eItemAbil::MESSAGE;
// Don't show charges when Sell button up and space tight
show_charges &= (stat_screen_mode == MODE_INVEN || stat_screen_mode == MODE_SHOP);
if(show_charges){
sout << '(' << int(item.charges) << ')';
}
dest_rect.left -= 2;
win_draw_string(item_stats_gworld(),dest_rect,sout.str(),eTextMode::WRAP,style);
style.italic = false;