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

fix prompt when importing outdoor sector

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-14 10:05:24 -05:00
parent 978af61054
commit 5faeab88f0
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,7 @@ static bool handle_lb_action(int i){
start_shops_editing();
break;
case LB_LOAD_OUT:
spot_hit = pick_out(cur_out, scenario);
spot_hit = pick_out(cur_out, scenario, "Edit");
if(spot_hit != cur_out) {
set_current_out(spot_hit, false);
if(overall_mode == MODE_EDIT_SPECIALS){

5
src/scenedit/scen.townout.cpp
View File

@@ -1586,7 +1586,7 @@ static bool finish_pick_out(cDialog& me, bool okay, location& cur_loc, location
return true;
}
location pick_out(location default_loc,cScenario& scenario) {
location pick_out(location default_loc,cScenario& scenario,std::string action) {
using namespace std::placeholders;
location prev_loc = default_loc;
if(default_loc.x < 0)
@@ -1595,6 +1595,7 @@ location pick_out(location default_loc,cScenario& scenario) {
default_loc.y = 0;
cDialog out_dlg(*ResMgr::dialogs.get("select-sector"));
out_dlg["prompt"].replaceText("{{Action}}", action);
out_dlg["okay"].attachClickHandler(std::bind(finish_pick_out, _1, true, std::ref(default_loc), prev_loc));
out_dlg["cancel"].attachClickHandler(std::bind(finish_pick_out, _1, false, std::ref(default_loc), prev_loc));
out_dlg.attachClickHandlers(std::bind(pick_out_event_filter, _1, _2, std::ref(default_loc), std::ref(scenario)), {"xplus", "xminus", "yplus", "yminus", "choose"});
@@ -1889,7 +1890,7 @@ cOutdoors* pick_import_out() {
fs::path path = nav_get_scenario();
if(path.empty()) return nullptr;
load_scenario(path, temp_scenario);
location sector = pick_out({-1,-1},temp_scenario);
location sector = pick_out({-1,-1},temp_scenario,"Import");
if(sector.x < 0 && sector.y < 0)
return nullptr;
cOutdoors* out = temp_scenario.outdoors[sector.x][sector.y];

2
src/scenedit/scen.townout.hpp
View File

@@ -13,7 +13,7 @@ void edit_town_events();
void edit_advanced_town();
void edit_basic_dlog(short which_node);
short edit_talk_node(short which_node);
location pick_out(location default_loc,cScenario& scenario);
location pick_out(location default_loc,cScenario& scenario,std::string action);
cTown* pick_import_town();
cOutdoors* pick_import_out();
bool new_town();