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

ignore uninitialized Rectangle 1-8

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-09 20:27:21 -05:00
parent fb7a3b80cf
commit 11f1a2f90d
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/boe.main.cpp
View File

@@ -1465,6 +1465,7 @@ void handle_one_minimap_event(const sf::Event& event) {
// Area rectangle hovered // Area rectangle hovered
const std::vector<info_rect_t>& area_desc = is_out() ? univ.out->area_desc : univ.town->area_desc; const std::vector<info_rect_t>& area_desc = is_out() ? univ.out->area_desc : univ.town->area_desc;
for(info_rect_t area : area_desc){ for(info_rect_t area : area_desc){
if(area.empty()) continue;
if(area.contains(tile)){ if(area.contains(tile)){
tooltip_text += area.descr + " |"; tooltip_text += area.descr + " |";
} }

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

@@ -1261,19 +1261,13 @@ std::string get_location(cUniverse* specific_univ) {
std::string loc_str = ""; std::string loc_str = "";
location loc = outdoors ? global_to_local(specific_univ->party.out_loc) : specific_univ->party.town_loc; location loc = outdoors ? global_to_local(specific_univ->party.out_loc) : specific_univ->party.town_loc;
if(outdoors) { const std::vector<info_rect_t>& area_desc = (outdoors ? specific_univ->out->area_desc : specific_univ->town->area_desc);
loc_str = specific_univ->out->name;
for(short i = 0; i < specific_univ->out->area_desc.size(); i++) loc_str = outdoors ? specific_univ->out->name : specific_univ->town->name;
if(loc.in(specific_univ->out->area_desc[i])) { for(const info_rect_t& area : area_desc){
loc_str = specific_univ->out->area_desc[i].descr; if(!area.empty() && loc.in(area)) {
} loc_str = area.descr;
} }
if(town){
loc_str = specific_univ->town->name;
for(short i = 0; i < specific_univ->town->area_desc.size(); i++)
if(loc.in(specific_univ->town->area_desc[i])) {
loc_str = specific_univ->town->area_desc[i].descr;
}
} }
return loc_str; return loc_str;
} }

2
src/game/boe.town.cpp
View File

@@ -1448,7 +1448,7 @@ void draw_map(bool need_refresh, std::string tooltip_text) {
info_rect_t area = area_desc[i]; info_rect_t area = area_desc[i];
rectangle& known_bounds = known_area_rects[i]; rectangle& known_bounds = known_area_rects[i];
// tile is in an area rectangle. see if it extends the party's known bounds of the area // tile is in an area rectangle. see if it extends the party's known bounds of the area
if(area.contains(where) && !is_blocked(real_where, false)){ if(!area.empty() && area.contains(where) && !is_blocked(real_where, false)){
if(where.x < known_bounds.left) known_bounds.left = where.x; if(where.x < known_bounds.left) known_bounds.left = where.x;
if(where.y < known_bounds.top) known_bounds.top = where.y; if(where.y < known_bounds.top) known_bounds.top = where.y;
if(where.x + 1 > known_bounds.right) known_bounds.right = where.x + 1; if(where.x + 1 > known_bounds.right) known_bounds.right = where.x + 1;