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

actually don't allow placing signs at edge of outdoors

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-28 12:25:53 -05:00
parent 0c12c7af3f
commit 6a8692e886
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2164,13 +2164,17 @@ static const std::array<location,5> trim_diffs = {{
}}; }};
void set_terrain(location l,ter_num_t terrain_type) { void set_terrain(location l,ter_num_t terrain_type) {
location l2;
cArea* cur_area = get_current_area(); cArea* cur_area = get_current_area();
if(!cur_area->is_on_map(l)) return; if(!cur_area->is_on_map(l)) return;
ter_num_t old = cur_area->terrain(l.x,l.y);
auto revert = [&cur_area, l, old]() {
cur_area->terrain(l.x,l.y) = old;
};
cur_area->terrain(l.x,l.y) = terrain_type; cur_area->terrain(l.x,l.y) = terrain_type;
l2 = l; location l2 = l;
// Large objects (eg rubble) // Large objects (eg rubble)
if(scenario.ter_types[terrain_type].obj_num > 0){ if(scenario.ter_types[terrain_type].obj_num > 0){
@@ -2225,6 +2229,7 @@ void set_terrain(location l,ter_num_t terrain_type) {
// Can't place signs at the edge of an outdoor section: // Can't place signs at the edge of an outdoor section:
if(!editing_town && (l.x == 0 || l.x == 47 || l.y == 0 || l.y == 47)) { if(!editing_town && (l.x == 0 || l.x == 47 || l.y == 0 || l.y == 47)) {
cChoiceDlog("not-at-edge").show(); cChoiceDlog("not-at-edge").show();
revert();
mouse_button_held = false; mouse_button_held = false;
return; return;
} }
@@ -2244,6 +2249,10 @@ void set_terrain(location l,ter_num_t terrain_type) {
} }
static_cast<location&>(*iter) = l; static_cast<location&>(*iter) = l;
ter_num_t terrain_type = cur_area->terrain(iter->x,iter->y); ter_num_t terrain_type = cur_area->terrain(iter->x,iter->y);
// Let the designer know the terrain was placed:
draw_terrain();
redraw_screen();
edit_sign(*iter, iter - signs.begin(), ter.picture); edit_sign(*iter, iter - signs.begin(), ter.picture);
mouse_button_held = false; mouse_button_held = false;
} }