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

Fix crash editing town entrance

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-28 10:47:08 -05:00
parent d37302acfb
commit 81e7e74717
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scenedit/scen.actions.cpp
View File

@@ -2443,11 +2443,17 @@ void town_entry(location spot_hit) {
return; return;
} }
// clean up old town entries // clean up old town entries
for(short x = 0; x < current_terrain->city_locs.size(); x++) for(short i = 0; i < current_terrain->city_locs.size(); i++){
if(current_terrain->city_locs[x].spec >= 0) { if(current_terrain->city_locs[i].spec >= 0) {
ter = current_terrain->terrain[current_terrain->city_locs[x].x][current_terrain->city_locs[x].y]; auto& city_loc = current_terrain->city_locs[i];
if(!get_current_area()->is_on_map(city_loc))
city_loc.spec = -1;
else{
ter = current_terrain->terrain[city_loc.x][city_loc.y];
if(scenario.ter_types[ter].special != eTerSpec::TOWN_ENTRANCE) if(scenario.ter_types[ter].special != eTerSpec::TOWN_ENTRANCE)
current_terrain->city_locs[x].spec = -1; city_loc.spec = -1;
}
}
} }
auto iter = std::find(current_terrain->city_locs.begin(), current_terrain->city_locs.end(), spot_hit); auto iter = std::find(current_terrain->city_locs.begin(), current_terrain->city_locs.end(), spot_hit);
if(iter != current_terrain->city_locs.end()) { if(iter != current_terrain->city_locs.end()) {