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

12
src/scenario/scenario.cpp
View File

@@ -110,8 +110,7 @@ cScenario::cScenario(const cScenario& other)
, scenario_timers(other.scenario_timers)
, scen_specials(other.scen_specials)
, storage_shortcuts(other.storage_shortcuts)
, last_out_edited(other.last_out_edited)
, last_town_edited(other.last_town_edited)
, editor_state(other.editor_state)
, format(other.format)
, campaign_id(other.campaign_id)
, scen_items(other.scen_items)
@@ -178,8 +177,7 @@ void swap(cScenario& lhs, cScenario& rhs) {
swap(lhs.scenario_timers, rhs.scenario_timers);
swap(lhs.scen_specials, rhs.scen_specials);
swap(lhs.storage_shortcuts, rhs.storage_shortcuts);
swap(lhs.last_out_edited, rhs.last_out_edited);
swap(lhs.last_town_edited, rhs.last_town_edited);
swap(lhs.editor_state, rhs.editor_state);
swap(lhs.format, rhs.format);
swap(lhs.campaign_id, rhs.campaign_id);
swap(lhs.scen_items, rhs.scen_items);
@@ -263,9 +261,9 @@ void cScenario::import_legacy(legacy::scenario_data_type& old){
scenario_timers[i].time = old.scenario_timer_times[i];
scenario_timers[i].node = old.scenario_timer_specs[i];
}
last_out_edited.x = old.last_out_edited.x;
last_out_edited.y = old.last_out_edited.y;
last_town_edited = old.last_town_edited;
editor_state.last_out_edited.x = old.last_out_edited.x;
editor_state.last_out_edited.y = old.last_out_edited.y;
editor_state.last_town_edited = old.last_town_edited;
adjust_diff = true;
}

13
src/scenario/scenario.hpp
View File

@@ -46,6 +46,15 @@ struct town_entrance_t {
int town;
};
// This is completely unnecessary outside of the scenario editor, but harmless to load anyway,
// and much easier to store in cScenario so readScenarioFromXML() doesn't need conditionally compiled
// access to scenedit-specific global variables (which won't work unless we want to compile the common
// sources 3 times), or globals redeclared for no reason in boe.main.cpp and pc.main.cpp
struct editor_state_t {
short last_town_edited;
location last_out_edited;
};
class cScenario {
public:
class cItemStorage {
@@ -84,9 +93,7 @@ public:
std::array<cTimer,20> scenario_timers;
std::vector<cSpecial> scen_specials;
std::array<cItemStorage,10> storage_shortcuts;
// These two \/ are populated at load time and then never used again
location last_out_edited;
short last_town_edited;
editor_state_t editor_state;
scenario_header_flags format;
std::string campaign_id; // A hopefully unique identifier to specify the campaign this scenario is a part of.
std::vector<cItem> scen_items;