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

Fix multiple inconsistencies when saving (#550)

Browse Source 
* debug_leave_town use same logic as normal town exit. fix #549
* Standardize all save party code paths

Fix #480
Fix #204
Fix #267

* remove file_in_mem now that it is redundant
* Print message when save file not chosen
This commit is contained in:
Nat Quayle Nelson
2025-01-26 11:56:57 -06:00
committed by GitHub
parent 1dcc400923
commit 6fc55ed311
14 changed files with 64 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio/fileio.hpp
View File

@@ -28,7 +28,7 @@ fs::path nav_get_or_decode_party();
fs::path nav_put_or_temp_party(fs::path def = "");
bool load_party(fs::path file_to_load, cUniverse& univ);
bool save_party(fs::path dest_file, const cUniverse& univ);
bool save_party(cUniverse& univ, bool save_as = false);
void init_directories(const char* exec_path);

23
src/fileio/fileio_party.cpp
View File

@@ -437,18 +437,17 @@ bool load_party_v2(fs::path file_to_load, cUniverse& real_univ){
} else showWarning("There was an error loading the party custom graphics.");
}
univ.file = file_to_load;
real_univ = std::move(univ);
return true;
}
//mode; // 0 - normal 1 - save as
bool save_party(fs::path dest_file, const cUniverse& univ) {
static bool save_party_const(const cUniverse& univ, bool save_as) {
// Make sure it has the proper file extension
std::string fname = dest_file.filename().string();
size_t dot = fname.find_last_of('.');
if(dot == std::string::npos || fname.substr(dot) != ".exg")
fname += ".exg";
dest_file = dest_file.parent_path()/fname;
fs::path dest_file = univ.file;
if(dest_file.extension() != ".exg"){
dest_file += ".exg";
}
tarball partyOut;
cTagFile file;
@@ -543,3 +542,13 @@ bool save_party(fs::path dest_file, const cUniverse& univ) {
return true;
}
bool save_party(cUniverse& univ, bool save_as) {
// univ.file can be empty for prefab parties, so a file browser might be needed
// even for a regular save.
if(save_as || univ.file.empty()){
univ.file = nav_put_or_temp_party();
}
// A file wasn't chosen
if(univ.file.empty()) return false;
return save_party_const(univ, save_as);
}