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

No magic number for item window size

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-19 12:34:17 -05:00
parent 1c99e963d4
commit ea47359739
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@
const int LINES_IN_TEXT_WIN = 11; const int LINES_IN_TEXT_WIN = 11;
const int TEXT_BUF_LEN = 70; const int TEXT_BUF_LEN = 70;
const int LINES_IN_ITEM_WIN = 8;
#include <sstream> #include <sstream>
#include <list> #include <list>
@@ -229,7 +231,7 @@ void put_item_screen(eItemWinMode screen_num) {
// Draw buttons at bottom // Draw buttons at bottom
item_offset = item_sbar->getPosition(); item_offset = item_sbar->getPosition();
for(short i = 0; i < 8; i++) for(short i = 0; i < LINES_IN_ITEM_WIN; i++)
for(auto& flag : item_area_button_active[i]) for(auto& flag : item_area_button_active[i])
flag = false; flag = false;
@@ -257,7 +259,7 @@ void put_item_screen(eItemWinMode screen_num) {
switch(screen_num) { switch(screen_num) {
case ITEM_WIN_SPECIAL: case ITEM_WIN_SPECIAL:
style.colour = Colours::BLACK; style.colour = Colours::BLACK;
for(short i = 0; i < 8; i++) { for(short i = 0; i < LINES_IN_ITEM_WIN; i++) {
i_num = i + item_offset; i_num = i + item_offset;
if(i_num < spec_item_array.size()) { if(i_num < spec_item_array.size()) {
win_draw_string(item_stats_gworld(),item_buttons[i][ITEMBTN_NAME],univ.scenario.special_items[spec_item_array[i_num]].name,eTextMode::WRAP,style); win_draw_string(item_stats_gworld(),item_buttons[i][ITEMBTN_NAME],univ.scenario.special_items[spec_item_array[i_num]].name,eTextMode::WRAP,style);
@@ -274,7 +276,7 @@ void put_item_screen(eItemWinMode screen_num) {
break; break;
case ITEM_WIN_QUESTS: case ITEM_WIN_QUESTS:
style.colour = Colours::BLACK; style.colour = Colours::BLACK;
for(short i = 0; i < 8; i++) { for(short i = 0; i < LINES_IN_ITEM_WIN; i++) {
i_num = i + item_offset; i_num = i + item_offset;
if(i_num < spec_item_array.size()) { if(i_num < spec_item_array.size()) {
int which_quest = spec_item_array[i_num] % 10000; int which_quest = spec_item_array[i_num] % 10000;
@@ -299,7 +301,7 @@ void put_item_screen(eItemWinMode screen_num) {
default: // on an items page default: // on an items page
style.colour = Colours::BLACK; style.colour = Colours::BLACK;
for(short i = 0; i < 8; i++) { for(short i = 0; i < LINES_IN_ITEM_WIN; i++) {
i_num = i + item_offset; i_num = i + item_offset;
sout.str(""); sout.str("");
sout << i_num + 1 << '.'; sout << i_num + 1 << '.';
@@ -356,7 +358,7 @@ void put_item_screen(eItemWinMode screen_num) {
} }
} // end of if item is there } // end of if item is there
} // end of for(short i = 0; i < 8; i++) } // end of for(short i = 0; i < LINES_IN_ITEM_WIN; i++)
break; break;
} }
undo_clip(item_stats_gworld()); undo_clip(item_stats_gworld());
@@ -544,7 +546,7 @@ void set_stat_window(eItemWinMode new_stat, bool record) {
stat_window = new_stat; stat_window = new_stat;
if(stat_window < ITEM_WIN_SPECIAL && univ.party[stat_window].main_status != eMainStatus::ALIVE) if(stat_window < ITEM_WIN_SPECIAL && univ.party[stat_window].main_status != eMainStatus::ALIVE)
stat_window = eItemWinMode(first_active_pc()); stat_window = eItemWinMode(first_active_pc());
item_sbar->setPageSize(8); item_sbar->setPageSize(LINES_IN_ITEM_WIN);
spec_item_array.clear(); spec_item_array.clear();
switch(stat_window) { switch(stat_window) {
case ITEM_WIN_SPECIAL: case ITEM_WIN_SPECIAL:
@@ -554,7 +556,7 @@ void set_stat_window(eItemWinMode new_stat, bool record) {
spec_item_array.push_back(i); spec_item_array.push_back(i);
array_pos++; array_pos++;
} }
array_pos = max(0,array_pos - 8); array_pos = max(0,array_pos - LINES_IN_ITEM_WIN);
item_sbar->setMaximum(array_pos); item_sbar->setMaximum(array_pos);
break; break;
case ITEM_WIN_QUESTS: case ITEM_WIN_QUESTS:
@@ -570,11 +572,11 @@ void set_stat_window(eItemWinMode new_stat, bool record) {
spec_item_array.push_back(i + 20000); spec_item_array.push_back(i + 20000);
array_pos++; array_pos++;
} }
array_pos = max(0,array_pos - 8); array_pos = max(0,array_pos - LINES_IN_ITEM_WIN);
item_sbar->setMaximum(array_pos); item_sbar->setMaximum(array_pos);
break; break;
default: default:
item_sbar->setMaximum(16); item_sbar->setMaximum(INVENTORY_SIZE - LINES_IN_ITEM_WIN);
break; break;
} }
item_sbar->setPosition(0); item_sbar->setPosition(0);