- Fix attempt at accessing invalid placed town locations
- Fix attempt at accessing invalid terrain in editor when checking whether to apply transformations
This commit is contained in:
2015-06-20 12:43:16 -04:00
parent c2970295d6
commit 3239d8e503
3 changed files with 3 additions and 2 deletions

View File

@@ -1306,7 +1306,7 @@ void erase_out_specials() {
if(quadrant_legal(i,j)) {
cOutdoors& sector = *univ.scenario.outdoors[univ.party.outdoor_corner.x + i][univ.party.outdoor_corner.y + j];
for(short k = 0; k < sector.city_locs.size(); k++) {
if(sector.city_locs[k].spec >= 0 &&
if(sector.city_locs[k].spec >= 0 && sector.city_locs[k].x < 48 &&
univ.scenario.ter_types[sector.terrain[sector.city_locs[k].x][sector.city_locs[k].y]].special == eTerSpec::TOWN_ENTRANCE &&
(sector.city_locs[k].x == minmax(0,47,sector.city_locs[k].x)) &&
(sector.city_locs[k].y == minmax(0,47,sector.city_locs[k].y))) {