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

when replaying, don't open file browsers

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-07-05 14:58:03 -06:00
committed by Celtic Minstrel
parent 3744005f68
commit 756cf658d6
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/boe.actions.cpp
View File

@@ -1010,7 +1010,7 @@ static void handle_victory() {
univ.party.scen_name = ""; // should be harmless...
if(cChoiceDlog("congrats-save",{"cancel","save"}).show() == "save"){
// TODO: Wait, this shouldn't be a "save as" action, should it? It should save without asking for a location.
fs::path file = nav_put_party();
fs::path file = nav_put_or_temp_party();
if(!file.empty()) save_party(file, univ);
}
}
@@ -2153,7 +2153,7 @@ bool handle_scroll(const sf::Event& event) {
}
void do_load() {
fs::path file_to_load = nav_get_party();
fs::path file_to_load = nav_get_or_decode_party();
if(file_to_load.empty()) return;
if(!load_party(file_to_load, univ))
return;
@@ -2203,7 +2203,7 @@ void do_save(short mode) {
if(univ.party.is_in_scenario()) save_outdoor_maps();
fs::path file = univ.file;
if(mode == 1 || file.empty())
file = nav_put_party(file);
file = nav_put_or_temp_party(file);
bool saved = false;
if(!file.empty()) {
univ.file = file;
@@ -2595,7 +2595,7 @@ void handle_death() {
return;
}
else if(choice == "load") {
fs::path file_to_load = nav_get_party();
fs::path file_to_load = nav_get_or_decode_party();
if(!file_to_load.empty()) load_party(file_to_load, univ);
if(univ.party.is_alive()) {
if(overall_mode != MODE_STARTUP)
@@ -2658,7 +2658,7 @@ void start_new_game(bool force) {
}
party_in_memory = true;
if(force) return;
fs::path file = nav_put_party();
fs::path file = nav_put_or_temp_party();
if(!file.empty()) save_party(file, univ);
univ.file = file;
}

6
src/game/boe.main.cpp
View File

@@ -457,7 +457,7 @@ void handle_one_event(const sf::Event& event) {
std::string choice = cChoiceDlog("quit-confirm-save", {"save","quit","cancel"}).show();
if(choice == "cancel") break;
if(choice == "save") {
fs::path file = nav_put_party();
fs::path file = nav_put_or_temp_party();
if(!file.empty()) break;
save_party(file, univ);
}
@@ -609,7 +609,7 @@ void handle_menu_choice(eMenu item_hit) {
std::string choice = cChoiceDlog("quit-confirm-save", {"save","quit","cancel"}).show();
if(choice == "cancel") break;
if(choice == "save") {
fs::path file = nav_put_party();
fs::path file = nav_put_or_temp_party();
if(!file.empty()) break;
save_party(file, univ);
}
@@ -623,7 +623,7 @@ void handle_menu_choice(eMenu item_hit) {
break;
if(choice == "save") {
if(univ.file.empty()) {
univ.file = nav_put_party();
univ.file = nav_put_or_temp_party();
if(univ.file.empty()) break;
}
save_party(univ.file, univ);