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

Officially move version info up to 2.0

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-01 15:44:21 -05:00
parent 07054eb465
commit 15a802f63d
7 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rsrc/dialogs/about-boe.xml
View File

@@ -7,7 +7,7 @@
-->
<pict type='dlog' num='16' top='6' left='6'/>
<text top='6' left='50' width='420' height='33'>
Blades of Exile v1.0.2 <br/>
Blades of Exile v2.0 alpha <br/>
Copyright 1997-8, Spiderweb Software, Inc., All rights reserved.
</text>
<text top='42' left='50' width='434' height='67'>

2
rsrc/dialogs/about-pced.xml
View File

@@ -7,7 +7,7 @@
<button name='okay' type='regular' top='260' left='431'>OK</button>
<pict top='6' left='6' type='dlog' num='16'/>
<text top='6' left='50' width='338' height='34'>
Blades of Exile Character Editor v1.0.1 <br/>
Blades of Exile Character Editor v2.0 alpha<br/>
Copyright 1997 Jeff Vogel, All rights reserved.
</text>
<text top='154' left='50' width='439' height='45'>

2
rsrc/dialogs/about-scened.xml
View File

@@ -7,7 +7,7 @@
<button name='okay' type='regular' top='270' left='430'>OK</button>
<pict type='dlog' num='16' top='6' left='6'/>
<text top='6' left='50' width='420' height='33'>
Blades of Exile Scenario Editor v1.0.4 <br/>
Blades of Exile Scenario Editor v2.0 alpha<br/>
Copyright 1997, Spiderweb Software, Inc., All rights reserved.
</text>
<text top='147' left='50' width='425' height='47'>

4
src/classes/scenario.cpp
View File

@@ -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;

2
src/classes/scenario.h
View File

@@ -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

3
src/scenedit/scen.fileio.cpp
View File

@@ -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

8
src/tools/fileio_party.cpp
View File

@@ -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;
}