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

Remove option to not save maps

Browse Source 
(LED is still available in the preferences but currently does nothing)
This commit is contained in:
Celtic Minstrel
2015-10-01 11:04:35 -04:00
parent a9e7988cf9
commit 50d88292b3
6 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/boe.actions.cpp
View File

@@ -87,7 +87,7 @@ extern short cen_x, cen_y, stat_window;//,pc_moves[6];
extern bool give_delays;
extern eGameMode overall_mode;
extern location to_create;
extern bool All_Done,play_sounds,frills_on,spell_forced,save_maps,monsters_going;
extern bool All_Done,play_sounds,frills_on,spell_forced,monsters_going;
extern bool party_in_memory,in_scen_debug;
// game info globals
@@ -2686,10 +2686,6 @@ void start_new_game(bool force) {
extern cCustomGraphics spec_scen_g;
spec_scen_g.party_sheet.reset();
// Default is save maps
PSD[SDF_NO_MAPS] = 0;
save_maps = true;
// Don't reset instant help just because they started a new game.
std::vector<int> help = get_iarray_pref("ReceivedHelp");
std::copy(help.begin(), help.end(), std::inserter(univ.party.help_received, univ.party.help_received.begin()));

1
src/boe.consts.hpp
View File

@@ -32,7 +32,6 @@
#define SDF_NO_BOAT_SPECIALS 305][7
#define SDF_RESURRECT_NO_BALM 305][8
#define SDF_HOSTILES_PRESENT 305][9
#define SDF_NO_MAPS 306][0
#define SDF_NO_SOUNDS 306][1
#define SDF_NO_FRILLS 306][2
#define SDF_ROOM_DESCS_AGAIN 306][3

7
src/boe.dlgutil.cpp
View File

@@ -46,7 +46,7 @@ extern short display_mode,current_pc;
extern eStatMode stat_screen_mode;
extern long register_flag;
extern long ed_flag,ed_key;
extern bool save_maps,give_delays;
extern bool give_delays;
extern location center;
extern std::shared_ptr<cScrollbar> text_sbar,item_sbar,shop_sbar;
extern std::shared_ptr<cButton> done_btn, help_btn;
@@ -1096,7 +1096,6 @@ void load_prefs(){
game_run_before = get_bool_pref("GameRunBefore");
skip_boom_delay = get_bool_pref("SkipBoomDelay");
PSD[SDF_NO_MAPS] = !get_bool_pref("SaveAutoMap", true);
PSD[SDF_NO_FRILLS] = !get_bool_pref("DrawTerrainFrills", true);
PSD[SDF_NO_INSTANT_HELP] = !get_bool_pref("ShowInstantHelp", true);
PSD[SDF_NO_TER_ANIM] = !get_bool_pref("DrawTerrainAnimation", true);
@@ -1119,7 +1118,6 @@ void save_prefs(bool resetHelp){
set_pref("SkipBoomDelay", skip_boom_delay);
if(overall_mode == MODE_STARTUP) {
set_pref("SaveAutoMap", !PSD[SDF_NO_MAPS]);
set_pref("DrawTerrainFrills", !PSD[SDF_NO_FRILLS]);
set_pref("ShowInstantHelp", !PSD[SDF_NO_INSTANT_HELP]);
set_pref("DrawTerrainAnimation", !PSD[SDF_NO_TER_ANIM]);
@@ -1157,7 +1155,6 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
else if(cur_display_mode == "bl") display_mode = 3;
else if(cur_display_mode == "br") display_mode = 4;
else if(cur_display_mode == "win") display_mode = 5;
PSD[SDF_NO_MAPS] = dynamic_cast<cLed&>(me["nomaps"]).getState() != led_off;
PSD[SDF_NO_SOUNDS] = dynamic_cast<cLed&>(me["nosound"]).getState() != led_off;
play_sounds = !PSD[SDF_NO_SOUNDS];
PSD[SDF_NO_FRILLS] = dynamic_cast<cLed&>(me["nofrills"]).getState() != led_off;
@@ -1189,7 +1186,6 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
reset_help = true;
}
}
save_maps = 1 - PSD[SDF_NO_MAPS];
give_delays = PSD[SDF_NO_FRILLS];
save_prefs(reset_help);
return true;
@@ -1223,7 +1219,6 @@ void pick_preferences() {
break;
}
dynamic_cast<cLed&>(prefsDlog["nomaps"]).setState(PSD[SDF_NO_MAPS] ? led_red : led_off);
dynamic_cast<cLed&>(prefsDlog["nosound"]).setState(!play_sounds ? led_red : led_off);
dynamic_cast<cLed&>(prefsDlog["nofrills"]).setState(PSD[SDF_NO_FRILLS] ? led_red : led_off);
dynamic_cast<cLed&>(prefsDlog["repeatdesc"]).setState(PSD[SDF_ROOM_DESCS_AGAIN] ? led_red : led_off);

5
src/boe.fileio.cpp
View File

@@ -27,7 +27,7 @@
extern eStatMode stat_screen_mode;
extern bool give_delays;
extern eGameMode overall_mode;
extern bool play_sounds,sys_7_avail,save_maps,party_in_memory,in_scen_debug,ghost_mode,node_step_through;
extern bool play_sounds,sys_7_avail,party_in_memory,in_scen_debug,ghost_mode,node_step_through;
extern location center;
extern long register_flag;
extern sf::RenderWindow mainPtr;
@@ -145,9 +145,6 @@ void finish_load_party(){
flip_sound();
}
give_delays = PSD[SDF_NO_FRILLS];
if(PSD[SDF_NO_MAPS] == 0)
save_maps = true;
else save_maps = false;
in_scen_debug = false;
}

2
src/boe.main.cpp
View File

@@ -40,7 +40,7 @@ short had_text_freeze = 0,num_fonts;
bool skip_boom_delay = false;
bool first_startup_update = true;
bool diff_depth_ok = false,first_sound_played = false,spell_forced = false,startup_loaded = false;
bool save_maps = true,party_in_memory = false;
bool party_in_memory = false;
std::shared_ptr<cScrollbar> text_sbar, item_sbar, shop_sbar;
std::shared_ptr<cButton> done_btn, help_btn;
rectangle sbar_rect = {283,546,421,562};

2
src/boe.party.cpp
View File

@@ -60,7 +60,7 @@ extern eGameMode overall_mode;
extern fs::path progDir;
extern location center;
extern sf::RenderWindow mainPtr;
extern bool spell_forced,save_maps,boom_anim_active;
extern bool spell_forced,boom_anim_active;
extern eSpell store_mage, store_priest;
extern short store_mage_lev, store_priest_lev;
extern short store_spell_target,pc_casting;