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
committed by Celtic Minstrel
parent 480a56084d
commit 3ee2428044
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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