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

extract editor state vars in cScenario to a new struct

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-09 08:37:13 -05:00
parent ae40151726
commit 21536fa1fa
7 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2882,6 +2882,6 @@ bool monst_on_space(location loc,short m_num) {
}
void restore_editor_state() {
set_current_town(scenario.last_town_edited);
set_current_out(scenario.last_out_edited);
set_current_town(scenario.editor_state.last_town_edited);
set_current_out(scenario.editor_state.last_out_edited);
}

4
src/scenedit/scen.main.cpp
View File

@@ -448,10 +448,8 @@ void handle_menu_choice(eMenu item_hit) {
break;
file_to_load = item_hit == eMenu::FILE_OPEN ? nav_get_scenario() : scenario.scen_file;
if(!file_to_load.empty() && load_scenario(file_to_load, scenario)) {
cur_town = scenario.last_town_edited;
town = scenario.towns[cur_town];
restore_editor_state();
change_made = false;
set_current_out(scenario.last_out_edited);
} else if(!file_to_load.empty())
set_up_start_screen(); // Failed to load file, dump to start
undo_list.clear();

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

@@ -1529,12 +1529,12 @@ void set_current_town(int to) {
if(to < 0 || to >= scenario.towns.size()) return;
cur_town = to;
town = scenario.towns[cur_town];
scenario.last_town_edited = cur_town;
scenario.editor_state.last_town_edited = cur_town;
}
void set_current_out(location out_sec) {
cur_out = out_sec;
scenario.last_out_edited = cur_out;
scenario.editor_state.last_out_edited = cur_out;
current_terrain = scenario.outdoors[cur_out.x][cur_out.y];
set_up_main_screen();
}