Officially move version info up to 2.0
This commit is contained in:
@@ -54,8 +54,8 @@ cScenario::cScenario(bool init_strings) {
|
||||
std::string temp_str;
|
||||
|
||||
format.ver[0] = 1;
|
||||
format.min_run_ver = 1;
|
||||
format.prog_make_ver[0] = 1;
|
||||
format.min_run_ver = 2;
|
||||
format.prog_make_ver[0] = 2;
|
||||
default_ground = 1;
|
||||
where_start.x = 24;
|
||||
where_start.y = 24;
|
||||
|
||||
@@ -115,6 +115,6 @@ public:
|
||||
};
|
||||
|
||||
// OBoE Current Version
|
||||
const unsigned long long OBOE_CURRENT_VERSION = 0x010000; // MMmmff; M - major, m - minor, f - bugfix
|
||||
const unsigned long long OBOE_CURRENT_VERSION = 0x020000; // MMmmff; M - major, m - minor, f - bugfix
|
||||
|
||||
#endif
|
||||
|
||||
@@ -767,8 +767,7 @@ map_data buildTownMapData(size_t which) {
|
||||
}
|
||||
|
||||
void save_scenario(fs::path toFile) {
|
||||
// TODO: I'm not certain 1.0.0 is the correct version here?
|
||||
scenario.format.prog_make_ver[0] = 1;
|
||||
scenario.format.prog_make_ver[0] = 2;
|
||||
scenario.format.prog_make_ver[1] = 0;
|
||||
scenario.format.prog_make_ver[2] = 0;
|
||||
// TODO: This is just a skeletal outline of what needs to be done to save the scenario
|
||||
|
||||
@@ -268,14 +268,6 @@ bool load_party_v1(fs::path file_to_load, cUniverse& univ, bool town_restore, bo
|
||||
univ.town.append(sfx, misc_i);
|
||||
}
|
||||
|
||||
// Compatibility flags
|
||||
// TODO: Pretty sure I did this elsewhere, so probably don't need it here
|
||||
if(in_scen && univ.scenario.format.prog_make_ver[0] < 2){
|
||||
univ.party.stuff_done[305][8] = 1;
|
||||
} else {
|
||||
univ.party.stuff_done[305][8] = 0;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user