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

Fix scenario editor crash setting terrain at town edge

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-25 17:49:25 -05:00
parent 9d5a79c97c
commit 7407781cac
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2184,6 +2184,7 @@ void set_terrain(location l,ter_num_t terrain_type) {
for(int x = -1; x <= 1; x++) { for(int x = -1; x <= 1; x++) {
for(int y = -1; y <= 1; y++) { for(int y = -1; y <= 1; y++) {
location l3(l.x+x,l.y+y); location l3(l.x+x,l.y+y);
if(!cur_area->is_on_map(l3)) continue;
ter_num_t ter_there = cur_area->terrain(l3.x,l3.y); ter_num_t ter_there = cur_area->terrain(l3.x,l3.y);
unsigned int ground_there = scenario.ter_types[ter_there].ground_type; unsigned int ground_there = scenario.ter_types[ter_there].ground_type;
if(ground_there != main_ground && ground_there != trim_ground) { if(ground_there != main_ground && ground_there != trim_ground) {
@@ -2204,6 +2205,7 @@ void set_terrain(location l,ter_num_t terrain_type) {
// Adjusting terrains with trim // Adjusting terrains with trim
for(location d : trim_diffs) { for(location d : trim_diffs) {
location l3(l.x+d.x, l.y+d.y); location l3(l.x+d.x, l.y+d.y);
if(!cur_area->is_on_map(l3)) continue;
adjust_space(l3); adjust_space(l3);
} }