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

Look up saved talk/encounter strings when loading a legacy savegame

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-22 09:29:01 -05:00
parent 4b96f579b7
commit 317a01afa1
4 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osx/tools/fileio.cpp
View File

@@ -729,8 +729,17 @@ bool load_party_v1(fs::path file_to_load, cUniverse& univ, bool town_restore, bo
fin.close();
// TODO: Need to convert after loading the scenario in order to look up saved strings.
// However, for that to work, the entire scenario (all towns and sections) would need to be in memory.
if(in_scen){
fs::path path;
path = progDir/"Blades of Exile Scenarios"/univ.party.scen_name;
if(!load_scenario(path, univ.scenario))
return false;
univ.file = path;
}else{
univ.party.scen_name = "";
}
univ.party.append(store_party);
univ.party.append(store_setup);
univ.party.void_pcs();
@@ -749,16 +758,6 @@ bool load_party_v1(fs::path file_to_load, cUniverse& univ, bool town_restore, bo
univ.append(o_maps);
univ.town.append(sfx, misc_i);
}
if(in_scen){
fs::path path;
path = progDir/"Blades of Exile Scenarios"/univ.party.scen_name;
if(!load_scenario(path, univ.scenario))
return false;
univ.file = path;
}else{
univ.party.scen_name = "";
}
// Compatibility flags
// TODO: Pretty sure I did this elsewhere, so probably don't need it here