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

game: try to always use the game's preferences: easy_mode and less_wanderings...

Browse Source
This commit is contained in:
Laurent alonso
2021-11-05 11:08:40 +01:00
committed by Celtic Minstrel
parent afc17ba754
commit e6c45a3162
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2689,6 +2689,9 @@ void start_new_game(bool force) {
} }
} }
party_in_memory = true; party_in_memory = true;
// use user's easy mode and less wandering mode
univ.party.easy_mode=get_bool_pref("EasyMode", false);
univ.party.less_wm=get_bool_pref("lesswm", false);
if(force) return; if(force) return;
fs::path file = nav_put_party(); fs::path file = nav_put_party();
if(!file.empty()) save_party(file, univ); if(!file.empty()) save_party(file, univ);

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

@@ -17,6 +17,7 @@
#include "boe.graphutil.hpp" #include "boe.graphutil.hpp"
#include "sounds.hpp" #include "sounds.hpp"
#include "mathutil.hpp" #include "mathutil.hpp"
#include "prefs.hpp"
#include "strdlog.hpp" #include "strdlog.hpp"
#include "fileio.hpp" #include "fileio.hpp"
#include "cursors.hpp" #include "cursors.hpp"
@@ -31,7 +32,6 @@ extern location center;
extern long register_flag; extern long register_flag;
extern sf::RenderWindow mainPtr; extern sf::RenderWindow mainPtr;
extern short which_combat_type; extern short which_combat_type;
extern short cur_town_talk_loaded;
extern cUniverse univ; extern cUniverse univ;
bool loaded_yet = false, got_nagged = false; bool loaded_yet = false, got_nagged = false;
@@ -57,6 +57,10 @@ void finish_load_party(){
party_in_memory = true; party_in_memory = true;
// use user's easy mode and less wandering mode
univ.party.easy_mode=get_bool_pref("EasyMode", false);
univ.party.less_wm=get_bool_pref("lesswm", false);
// now if not in scen, this is it. // now if not in scen, this is it.
if(!in_scen) { if(!in_scen) {
if(overall_mode != MODE_STARTUP) { if(overall_mode != MODE_STARTUP) {