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

Issue #101 unit test (should fail)

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-09-11 18:31:08 -05:00
committed by Celtic Minstrel
parent 38de505723
commit 34b7eb9a76
20 changed files with 20225 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio/fileio.hpp
View File

@@ -19,7 +19,7 @@ class cScenario;
class cUniverse;
fs::path locate_scenario(std::string scen_name);
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false);
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false, bool pop_paths = true);
fs::path nav_get_or_decode_party();
fs::path nav_put_or_temp_party(fs::path def = "");

26
src/fileio/fileio_scen.cpp
View File

@@ -100,20 +100,22 @@ fs::path locate_scenario(std::string scen_name) {
return scenPath;
}
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) {
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header, bool pop_paths) {
// Before loading a scenario, we may need to pop scenario resource paths.
fs::path graphics_path = ResMgr::graphics.popPath();
for(auto p : graphics_path) {
if(p.string() == "data") {
ResMgr::graphics.pushPath(graphics_path);
break;
if(pop_paths){
fs::path graphics_path = ResMgr::graphics.popPath();
for(auto p : graphics_path) {
if(p.string() == "data") {
ResMgr::graphics.pushPath(graphics_path);
break;
}
}
}
fs::path sounds_path = ResMgr::sounds.popPath();
for(auto p : sounds_path) {
if(p.string() == "data") {
ResMgr::sounds.pushPath(sounds_path);
break;
fs::path sounds_path = ResMgr::sounds.popPath();
for(auto p : sounds_path) {
if(p.string() == "data") {
ResMgr::sounds.pushPath(sounds_path);
break;
}
}
}
scenario = cScenario();