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

remove ITEMBTN_NORM and _ALL, and button_position arg

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-12-27 17:32:24 -06:00
committed by Celtic Minstrel
parent 78779b7d98
commit b7da0f0c62
3 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/boe.consts.hpp
View File

@@ -120,9 +120,6 @@ enum eItemButton {
MAX_eItemButton // keep last MAX_eItemButton // keep last
}; };
const int ITEMBTN_ALL = 10; // use, give, drop, info
const int ITEMBTN_NORM = 11; // give, drop, info
// PC buttons // PC buttons
enum ePlayerButton { enum ePlayerButton {
PCBTN_NAME = 0, PCBTN_NAME = 0,

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

@@ -260,10 +260,10 @@ void put_item_screen(eItemWinMode screen_num) {
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);
place_item_button(3,i,ITEMBTN_INFO); place_item_button(i,ITEMBTN_INFO);
if((univ.scenario.special_items[spec_item_array[i_num]].flags % 10 == 1) if((univ.scenario.special_items[spec_item_array[i_num]].flags % 10 == 1)
&& (!(is_combat()))) && (!(is_combat())))
place_item_button(0,i,ITEMBTN_DROP); // TODO: Shouldn't this be ITEMBTN_USE? place_item_button(i,ITEMBTN_DROP); // TODO: Shouldn't this be ITEMBTN_USE?
} }
} }
break; break;
@@ -286,7 +286,7 @@ void put_item_screen(eItemWinMode screen_num) {
draw_line(item_stats_gworld, from, to, 1, Colours::GREEN); draw_line(item_stats_gworld, from, to, 1, Colours::GREEN);
} }
place_item_button(3,i,ITEMBTN_INFO); place_item_button(i,ITEMBTN_INFO);
} }
} }
break; break;
@@ -333,16 +333,16 @@ void put_item_screen(eItemWinMode screen_num) {
place_item_graphic(i,item.graphic_num); place_item_graphic(i,item.graphic_num);
// The info button is harmless and can be useful while shopping, so always show it // The info button is harmless and can be useful while shopping, so always show it
place_item_button(3,i,ITEMBTN_INFO); place_item_button(i,ITEMBTN_INFO);
if(stat_screen_mode == MODE_INVEN && if(stat_screen_mode == MODE_INVEN &&
prime_time() && pc == univ.cur_pc) { prime_time() && pc == univ.cur_pc) {
// place give and drop and use // place give and drop and use
place_item_button(1,i,ITEMBTN_GIVE); place_item_button(i,ITEMBTN_GIVE);
place_item_button(2,i,ITEMBTN_DROP); place_item_button(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(0,i,ITEMBTN_USE); place_item_button(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) {
@@ -456,39 +456,12 @@ void place_item_graphic(short which_slot,short graphic) {
} }
// name, use, give, drop, info, sell/id // name, use, give, drop, info, sell/id
// shortcuts - if which_button_to_put is 10, all 4 buttons now void place_item_button(short which_slot,eItemButton button_type) {
// if which_button_to_put is 11, just right 2
void place_item_button(short button_position,short which_slot,eItemButton button_type) {
rectangle from_rect = {0,0,18,18},to_rect; rectangle from_rect = {0,0,18,18},to_rect;
sf::Texture& invenbtn_gworld = *ResMgr::graphics.get("invenbtns"); sf::Texture& invenbtn_gworld = *ResMgr::graphics.get("invenbtns");
switch(button_position) { item_area_button_active[which_slot][button_type] = true;
default: // this means put a regular item button rect_draw_some_item(invenbtn_gworld, item_buttons_from[button_type - 2], item_stats_gworld, item_buttons[which_slot][button_type], sf::BlendAlpha);
item_area_button_active[which_slot][button_type] = true;
rect_draw_some_item(invenbtn_gworld, item_buttons_from[button_type - 2], item_stats_gworld, item_buttons[which_slot][button_type], sf::BlendAlpha);
break;
case ITEMBTN_ALL: // this means put all 4
item_area_button_active[which_slot][ITEMBTN_USE] = true;
item_area_button_active[which_slot][ITEMBTN_GIVE] = true;
item_area_button_active[which_slot][ITEMBTN_DROP] = true;
item_area_button_active[which_slot][ITEMBTN_INFO] = true;
from_rect = item_buttons_from[0];
from_rect.right = item_buttons_from[3].right;
to_rect = item_buttons[which_slot][ITEMBTN_USE];
to_rect.right = to_rect.left + from_rect.right - from_rect.left;
rect_draw_some_item(invenbtn_gworld, from_rect, item_stats_gworld, to_rect, sf::BlendAlpha);
break;
case ITEMBTN_NORM: // this means put right 3
item_area_button_active[which_slot][ITEMBTN_GIVE] = true;
item_area_button_active[which_slot][ITEMBTN_DROP] = true;
item_area_button_active[which_slot][ITEMBTN_INFO] = true;
from_rect = item_buttons_from[1];
from_rect.right = item_buttons_from[3].right;
to_rect = item_buttons[which_slot][ITEMBTN_GIVE];
to_rect.right = to_rect.left + from_rect.right - from_rect.left;
rect_draw_some_item(invenbtn_gworld, from_rect, item_stats_gworld, to_rect, sf::BlendAlpha);
break;
}
} }
void place_item_bottom_buttons() { void place_item_bottom_buttons() {

2
src/game/boe.text.hpp
View File

@@ -8,7 +8,7 @@ void put_item_screen(eItemWinMode screen_num);
void place_item_bottom_buttons(); void place_item_bottom_buttons();
void set_stat_window(eItemWinMode new_stat, bool record = false); void set_stat_window(eItemWinMode new_stat, bool record = false);
void set_stat_window_for_pc(int pc, bool record = false); void set_stat_window_for_pc(int pc, bool record = false);
void place_item_button(short button_position,short which_slot,eItemButton button_type = ITEMBTN_USE); void place_item_button(short which_slot,eItemButton button_type = ITEMBTN_USE);
void place_item_graphic(short which_slot,short graphic); void place_item_graphic(short which_slot,short graphic);
short first_active_pc(); short first_active_pc();
void refresh_stat_areas(short mode); void refresh_stat_areas(short mode);