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

Fix several issues with saving and loading games

Browse Source 
- PC's internal reference to the party was clobbered on load
- Several dynamic structures still made assumptions about their size, causing crashes
- Issues with town maps due to treating all towns as 64x64
- Town maps were saved only if you are in town
This commit is contained in:
Celtic Minstrel
2016-10-01 17:52:05 -04:00
parent 8edc156496
commit c1bfc99164
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/classes/party.cpp
View File

@@ -189,6 +189,13 @@ void cParty::swap(cParty& other) {
memcpy(temp_setup, setup, sizeof(setup));
memcpy(setup, other.setup, sizeof(setup));
memcpy(other.setup, temp_setup, sizeof(setup));
// Fixup the references of PCs to their party
for(size_t i = 0; i < adven.size(); i++) {
adven[i]->join_party(*this);
}
for(size_t i = 0; i < other.adven.size(); i++) {
other.adven[i]->join_party(other);
}
}
void cParty::import_legacy(legacy::party_record_type& old, cUniverse& univ){
@@ -751,7 +758,7 @@ void cParty::writeTo(std::ostream& file, const cScenario& scen) const {
file << "CAMPAIGN " << campaign_id << ' ' << i << ' ' << j << ' ' << unsigned(iter->second.idx[i][j]) << '\n';
}
file << '\f';
for(int i = 0; i < 30; i++){
for(int i = 0; i < boats.size(); i++){
if(boats[i].exists) {
file << "BOAT " << i << '\n';
boats[i].writeTo(file);
@@ -759,7 +766,7 @@ void cParty::writeTo(std::ostream& file, const cScenario& scen) const {
}
}
file << '\f';
for(int i = 0; i < 30; i++){
for(int i = 0; i < horses.size(); i++){
if(horses[i].exists) {
file << "HORSE " << i << '\n';
horses[i].writeTo(file);
@@ -768,7 +775,7 @@ void cParty::writeTo(std::ostream& file, const cScenario& scen) const {
}
file << '\f';
for(auto& p : magic_store_items) {
for(int j = 0; j < 10; j++)
for(int j = 0; j < p.second.size(); j++)
if(p.second[j].variety != eItemType::NO_ITEM){
file << "MAGICSTORE " << p.first << ' ' << j << '\n';
p.second[j].writeTo(file);
@@ -783,7 +790,7 @@ void cParty::writeTo(std::ostream& file, const cScenario& scen) const {
file << "JOB " << j << ' ' << job_banks[i].jobs[j] << '\n';
}
file << '\f';
for(int i = 0; i < 10; i++)
for(int i = 0; i < out_c.size(); i++)
if(out_c[i].exists){
file << "ENCOUNTER " << i << "\n";
file << "DIRECTION " << out_c[i].direction << '\n';
@@ -809,7 +816,7 @@ void cParty::writeTo(std::ostream& file, const cScenario& scen) const {
}
}
file << '\f';
for(int i = 0; i < 3; i++)
for(int i = 0; i < stored_items.size(); i++)
for(size_t j = 0; j < stored_items[i].size(); j++)
if(stored_items[i][j].variety != eItemType::NO_ITEM){
file << "STORED " << i << ' ' << j << '\n';

8
src/tools/fileio_party.cpp
View File

@@ -309,6 +309,8 @@ bool load_party_v2(fs::path file_to_load, cUniverse& real_univ){
return false;
}
univ.party[i].readFrom(fin);
// Do this to make sure the PC's internal party reference is correct
univ.party[i].join_party(univ.party);
}
// Including stored PCs
@@ -344,7 +346,7 @@ bool load_party_v2(fs::path file_to_load, cUniverse& real_univ){
// Read town maps
std::istream& fin2 = partyIn.getFile("save/townmaps.dat");
for(int i = 0; i < univ.scenario.towns.size(); i++)
for(int j = 0; j < 64; j++)
for(int j = 0; j < univ.scenario.towns[i]->max_dim; j++)
fin2 >> univ.scenario.towns[i]->maps[j];
} else univ.party.town_num = 200;
@@ -420,11 +422,13 @@ bool save_party(fs::path dest_file, const cUniverse& univ) {
if(univ.party.town_num < 200) {
// Write the current town data
univ.town.writeTo(partyOut.newFile("save/town.txt"));
}
{
// Write the town map data
std::ostream& fout = partyOut.newFile("save/townmaps.dat");
for(int i = 0; i < univ.scenario.towns.size(); i++)
for(int j = 0; j < 64; j++)
for(int j = 0; j < univ.scenario.towns[i]->max_dim; j++)
fout << univ.scenario.towns[i]->maps[j] << '\n';
}