Remove/rearrange some settings and improve tiny button/LED handling

rsrc/dialogs/confirm-reset-help.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
+<dialog defbtn='no'>
+	<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
+	<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
+	<pict type='dlog' num='11' top='9' left='9'/>
+	<text top='4' left='51' width='251' height='32'>
+		Really reset instant help messages?
+	</text>
+</dialog>

rsrc/dialogs/preferences.xml

@@ -5,8 +5,26 @@
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='0' left='4' width='218' height='16'>
 		Blades of Exile Preferences
 	</text>
-	<text size='large' relative='pos-in pos' rel-anchor='prev' top='3' left='10' width='182' height='17'>Display alignment:</text>
-	<text name='disp-frame' framed='true' relative='pos-in pos' rel-anchor='prev' top='6' left='5' width='277' height='102'/>
+	<text name='scale-head' size='large' relative='pos-in pos' rel-anchor='prev' top='10' left='10' width='260' height='17'>Scale UI:</text>
+	<group name='scaleui'>
+		<led name='1' relative='pos-in pos' anchor='scale-head' top='4' left='15' width='33'>1</led>
+		<led name='1_5' relative='pos-in pos' anchor='scale-head' top='4' left='55' width='33'>1.5</led>
+		<led name='2' relative='pos-in pos' anchor='scale-head' top='4' left='95' width='33'>2</led>
+		<led name='3' relative='pos-in pos' anchor='scale-head' top='4' left='135' width='33'>3</led>
+		<led name='4' relative='pos-in pos' anchor='scale-head' top='4' left='175' width='33'>4</led>
+		<led name='other' relative='pos-in pos' anchor='scale-head' top='4' left='215' width='85'/>
+	</group>
+	<text name='scalemap-head' size='large' relative='neg pos' anchor='scale-head' top='17' left='0' width='260' height='17'>Scale Map:</text>
+	<group name='scalemap'>
+		<led name='1' relative='pos-in pos' anchor='scalemap-head' top='4' left='15' width='33'>1</led>
+		<led name='1_5' relative='pos-in pos' anchor='scalemap-head' top='4' left='55' width='33'>1.5</led>
+		<led name='2' relative='pos-in pos' anchor='scalemap-head' top='4' left='95' width='33'>2</led>
+		<led name='3' relative='pos-in pos' anchor='scalemap-head' top='4' left='135' width='33'>3</led>
+		<led name='4' relative='pos-in pos' anchor='scalemap-head' top='4' left='175' width='33'>4</led>
+		<led name='other' relative='pos-in pos' anchor='scalemap-head' top='4' left='215' width='85'/>
+	</group>
+	<text size='large' relative='pos-in pos' anchor='scalemap-head' top='30' left='0' width='182' height='17'>Display alignment:</text>
+	<text name='disp-frame' framed='true' relative='pos-in pos' rel-anchor='prev' top='6' left='0' width='277' height='102'/>
 	<group name='display'>
 		<led name='tl' relative='pos-in' anchor='disp-frame' top='7' left='8' width='54'>Top Left</led>
 		<led name='tr' relative='neg-in pos-in' anchor='disp-frame' top='7' left='128' width='62'>Top Right</led>
@@ -22,39 +40,16 @@
 		<led name='slow' relative='pos-in pos' anchor='spd-head' top='4' left='190' width='53'>Slow</led>
 		<led name='snail' relative='pos-in pos' anchor='spd-head' top='4' left='274' width='70'>Quite Slow</led>
 	</group>
-	<text size='large' relative='pos-in pos' anchor='spd-head' top='23' left='0' width='182' height='17'>For older machines:</text>
-	<led name='nofrills' relative='pos-in pos' rel-anchor='prev' top='6' left='0' width='335'>
-		No graphics frills (lose special effects)
-	</led>
-	<led name='noanim' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='335'>Turn off terrain animation</led>
-	<led name='noshore' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='335'>Turn of frills on shore</led>
-	<led name='nosound' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='117'>No Sounds</led>
+	<text name='misc-head' size='large' relative='pos-in pos' anchor='spd-head' top='30' left='0' width='182' height='17'>Miscellaneous:</text>
+	<led name='nosound' relative='pos-in pos' anchor='misc-head' top='6' left='15' width='117'>No Sounds</led>
 	<led name='repeatdesc' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='287'>Show room descriptions more than once</led>
 	<led name='nohelp' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='306'>Never show instant help</led>
-	<led name='resethelp' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='340'>
-		Reset instant help (all help windows will reappear)
-	</led>
 	<led name='easier' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='352'>Make game easier (monsters much weaker)</led>
 	<led name='lesswm' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='340'>Fewer wandering monsters</led>
 	<led name='skipsplash' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='340'>Skip splash screen on startup</led>
-	<text name='scale-head' size='large' relative='neg pos' anchor='skipsplash' top='17' left='10' width='260' height='17'>Scale UI:</text>
-	<group name='scaleui'>
-		<led name='1' relative='pos-in pos' anchor='scale-head' top='4' left='15' width='33'>1</led>
-		<led name='1_5' relative='pos-in pos' anchor='scale-head' top='4' left='55' width='33'>1.5</led>
-		<led name='2' relative='pos-in pos' anchor='scale-head' top='4' left='95' width='33'>2</led>
-		<led name='3' relative='pos-in pos' anchor='scale-head' top='4' left='135' width='33'>3</led>
-		<led name='4' relative='pos-in pos' anchor='scale-head' top='4' left='175' width='33'>4</led>
-		<led name='other' relative='pos-in pos' anchor='scale-head' top='4' left='215' width='85'/>
-	</group>
-	<text name='scalemap-head' size='large' relative='neg pos' anchor='scale-head' top='17' left='0' width='260' height='17'>Scale Map:</text>
-	<group name='scalemap'>
-		<led name='1' relative='pos-in pos' anchor='scalemap-head' top='4' left='15' width='33'>1</led>
-		<led name='1_5' relative='pos-in pos' anchor='scalemap-head' top='4' left='55' width='33'>1.5</led>
-		<led name='2' relative='pos-in pos' anchor='scalemap-head' top='4' left='95' width='33'>2</led>
-		<led name='3' relative='pos-in pos' anchor='scalemap-head' top='4' left='135' width='33'>3</led>
-		<led name='4' relative='pos-in pos' anchor='scalemap-head' top='4' left='175' width='33'>4</led>
-		<led name='other' relative='pos-in pos' anchor='scalemap-head' top='4' left='215' width='85'/>
-	</group>
-	<button name='okay' relative='abs pos' anchor='scalemap-head' type='regular' top='17' left='354'>OK</button>
-	<button name='cancel' relative='neg pos-in' anchor='okay' type='regular' def-key='esc' top='0' left='73'>Cancel</button>
+	<button name='resethelp' type='tiny' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='340'>
+		Reset instant help (all help windows will reappear)
+	</button>
+	<button name='okay' relative='abs pos' rel-anchor='prev' type='regular' top='17' left='354'>OK</button>
+	<button name='cancel' relative='neg pos-in' rel-anchor='prev' type='regular' def-key='esc' top='0' left='73'>Cancel</button>
 </dialog>

src/game/boe.dlgutil.cpp

@@ -1165,18 +1165,15 @@ void do_sign(short town_num, short which_sign, short sign_type) {
 	sign.show();
 }
 
-void save_prefs(bool resetHelp){
-
-	if(resetHelp) clear_pref("ReceivedHelp");
-
+void save_prefs(){
 	bool success = sync_prefs();
 	if(!success){
 		showWarning("There was a problem writing to the preferences file. When the game is next run the preferences will revert to their previously set values.","Should you manage to resolve the problem without closing the program, simply open the preferences screen and click \"OK\" to try again.");
 	}
 }
 
 static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
-	bool did_cancel = false,reset_help = false;
+	bool did_cancel = false;
 
 	if(id == "okay") {
 		me.toast(true);
@@ -1195,7 +1192,6 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
 		else if(cur_display_mode == "br") set_pref("DisplayMode", 4);
 		else if(cur_display_mode == "win") set_pref("DisplayMode", 5);
 		set_pref("PlaySounds", dynamic_cast<cLed&>(me["nosound"]).getState() == led_off);
-		set_pref("DrawTerrainFrills", dynamic_cast<cLed&>(me["nofrills"]).getState() == led_off);
 		set_pref("RepeatRoomDescriptions", dynamic_cast<cLed&>(me["repeatdesc"]).getState() != led_off);
 		set_pref("ShowInstantHelp", dynamic_cast<cLed&>(me["nohelp"]).getState() == led_off);
 
@@ -1206,8 +1202,6 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
 			univ.party.easy_mode = dynamic_cast<cLed&>(me["easier"]).getState() != led_off;
 			univ.party.less_wm = dynamic_cast<cLed&>(me["lesswm"]).getState() != led_off;
 		}
-		set_pref("DrawTerrainAnimation", dynamic_cast<cLed&>(me["noanim"]).getState() == led_off);
-		set_pref("DrawTerrainShoreFrills", dynamic_cast<cLed&>(me["noshore"]).getState() == led_off);
 		set_pref("ShowStartupSplash", dynamic_cast<cLed&>(me["skipsplash"]).getState() == led_off);
 		std::string speed = dynamic_cast<cLedGroup&>(me["speed"]).getSelected();
 		/* TODO: Should I add these additional preferences from Windows?
@@ -1224,9 +1218,6 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
 			set_pref("GameSpeed", 2);
 		else if(speed == "snail")
 			set_pref("GameSpeed", 3);
-		if(dynamic_cast<cLed&>(me["resethelp"]).getState() == led_red) {
-			reset_help = true;
-		}
 		std::string scale = dynamic_cast<cLedGroup&>(me["scaleui"]).getSelected();
 		if(scale == "1")
 			set_pref("UIScale", 1.0);
@@ -1250,7 +1241,13 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) {
 		else if(scale_map == "4")
 			set_pref("UIScaleMap", 4.0);
 	}
-	save_prefs(reset_help);
+	save_prefs();
+	return true;
+}
+
+static bool reset_help(cDialog& me, std::string id, eKeyMod) {
+	if(cChoiceDlog("confirm-reset-help", {"yes", "no"}, &me).show() == "yes")
+		clear_pref("ReceivedHelp");
 	return true;
 }
 
@@ -1263,6 +1260,7 @@ void pick_preferences(bool record) {
 
 	cDialog prefsDlog(*ResMgr::dialogs.get("preferences"));
 	prefsDlog.attachClickHandlers(&prefs_event_filter, {"okay", "cancel"});
+	prefsDlog.attachClickHandlers(&reset_help, {"resethelp"});
 
 	cLedGroup& displayMode = dynamic_cast<cLedGroup&>(prefsDlog["display"]);
 	switch(get_int_pref("DisplayMode")) {
@@ -1287,7 +1285,6 @@ void pick_preferences(bool record) {
 	}
 
 	dynamic_cast<cLed&>(prefsDlog["nosound"]).setState(get_bool_pref("PlaySounds", true) ? led_off : led_red);
-	dynamic_cast<cLed&>(prefsDlog["nofrills"]).setState(get_bool_pref("DrawTerrainFrills", true) ? led_off : led_red);
 	dynamic_cast<cLed&>(prefsDlog["repeatdesc"]).setState(get_bool_pref("RepeatRoomDescriptions") ? led_red : led_off);
 	dynamic_cast<cLed&>(prefsDlog["nohelp"]).setState(get_bool_pref("ShowInstantHelp", true) ? led_off : led_red);
 	if(overall_mode == MODE_STARTUP && !party_in_memory) {
@@ -1297,8 +1294,6 @@ void pick_preferences(bool record) {
 		dynamic_cast<cLed&>(prefsDlog["easier"]).setState(univ.party.easy_mode ? led_red : led_off);
 		dynamic_cast<cLed&>(prefsDlog["lesswm"]).setState(univ.party.less_wm ? led_red : led_off);
 	}
-	dynamic_cast<cLed&>(prefsDlog["noanim"]).setState(get_bool_pref("DrawTerrainAnimations", true) ? led_off : led_red);
-	dynamic_cast<cLed&>(prefsDlog["noshore"]).setState(get_bool_pref("DrawTerrainShoreFrills", true) ? led_off : led_red);
 	dynamic_cast<cLed&>(prefsDlog["skipsplash"]).setState(get_bool_pref("ShowStartupSplash", true) ? led_off : led_red);
 	cLedGroup& gameSpeed = dynamic_cast<cLedGroup&>(prefsDlog["speed"]);
 	switch(get_int_pref("GameSpeed")) {

src/game/boe.dlgutil.hpp

@@ -22,7 +22,7 @@ void do_talk(short personality, unsigned short m_num);
 void put_party_stats();
 void edit_party();
 void pick_preferences(bool record = true);
-void save_prefs(bool resetHelp = false);
+void save_prefs();
 void tip_of_day();
 struct scen_header_type pick_a_scen();
 

src/game/boe.graphics.cpp

@@ -681,7 +681,6 @@ void draw_terrain(short mode) {
 	char can_draw;
 	ter_num_t spec_terrain;
 	bool draw_frills = true;
-	bool frills_on = get_bool_pref("DrawTerrainShoreFrills", true);
 
 	if(overall_mode == MODE_TALKING || overall_mode == MODE_SHOPPING || overall_mode == MODE_STARTUP)
 		return;
@@ -853,7 +852,7 @@ void draw_terrain(short mode) {
 				draw_one_terrain_spot(q,r,-1);
 			}
 
-			if((can_draw != 0) && (overall_mode != MODE_RESTING) && frills_on && draw_frills)
+			if((can_draw != 0) && (overall_mode != MODE_RESTING) && draw_frills)
 				place_trim((short) q,(short) r,where_draw,spec_terrain);
 //			if((is_town() && univ.town.is_spot(where_draw.x,where_draw.y)) ||
 //			   (is_out() && univ.out.outdoors[univ.party.i_w_c.x][univ.party.i_w_c.y].special_spot[where_draw.x][where_draw.y]))
@@ -943,8 +942,6 @@ void place_trim(short q,short r,location where,ter_num_t ter_type) {
 	// FIrst quick check ... if a pit or barrier in outdoor combat, no trim
 	if((is_combat()) && (which_combat_type == 0) && (ter_type == 90))
 		return;
-	if(!get_bool_pref("DrawTerrainShoreFrills", true))
-		return;
 
 	targ.x = q;
 	targ.y = r;
@@ -1083,7 +1080,7 @@ static void init_trim_mask(std::unique_ptr<sf::Texture>& mask, rectangle src_rec
 //short which_mode;  // 0 top 1 bottom 2 left 3 right 4 up left 5 up right 6 down right 7 down left
 void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter) {
 	/* TODO: Windows has a check for frills being enabled:
-	if(!frills_on || (((current_ground == 2) || (current_ground == 36)) && (PSD[SDF_COMPATIBILITY_FULL_TRIMS] == 0)))
+	if(((current_ground == 2) || (current_ground == 36)) && (PSD[SDF_COMPATIBILITY_FULL_TRIMS] == 0))
 	    return;
 	*/
 	// which_trim
@@ -1127,9 +1124,6 @@ void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter) {
 	}
 	sf::Color test_color = {0,0,0}, store_color;
 
-	if(!get_bool_pref("DrawTerrainShoreFrills", true))
-		return;
-
 	unsigned short pic = univ.scenario.ter_types[ground_ter].picture;
 	if(pic < 960){
 		int which_sheet = pic / 50;
@@ -1359,7 +1353,7 @@ void boom_space(location where,short mode,short type,short damage,short sound) {
 		return;
 	if((boom_anim_active) && (type != 3))
 		return;
-	if(!get_bool_pref("DrawTerrainFrills", true) && fast_bang)
+	if(fast_bang)
 		return;
 	if(is_out())
 		return;

src/game/boe.main.cpp

@@ -959,7 +959,6 @@ void update_terrain_animation() {
 	static const long fortyTicks = time_in_ticks(40).asMilliseconds();
 
 	if(overall_mode == MODE_STARTUP) return;
-	if(!get_bool_pref("DrawTerrainAnimation", true)) return;
 	if(animTimer.getElapsedTime().asMilliseconds() < fortyTicks) return;
 
 	anim_ticks++;
@@ -1296,6 +1295,5 @@ void pause(short length) {
 	// Before pausing, make sure the screen is updated.
 	redraw_screen(REFRESH_NONE);
 
-	if(get_bool_pref("DrawTerrainFrills", true))
-		sf::sleep(time_in_ticks(len));
+	sf::sleep(time_in_ticks(len));
 }

src/game/boe.newgraph.cpp

@@ -124,7 +124,7 @@ void apply_unseen_mask() {
 	rectangle base_rect = {9,9,53,45},to_rect,big_to = {13,13,337,265};
 	bool need_bother = false;
 
-	if(!get_bool_pref("DrawTerrainFrills", true) || fog_lifted)
+	if(fog_lifted)
 		return;
 
 	if((is_combat()) && (which_combat_type == 0))
@@ -155,7 +155,7 @@ void apply_light_mask(bool onWindow) {
 	rectangle temp = {0,0,108,84},paint_rect,base_rect = {0,0,36,28};
 	rectangle big_to = {13,13,337,265};
 	bool same_mask = true;
-	if(!get_bool_pref("DrawTerrainFrills", true) || fog_lifted)
+	if(fog_lifted)
 		return;
 	if(is_out() || overall_mode == MODE_RESTING)
 		return;
@@ -257,8 +257,6 @@ void end_missile_anim() {
 void add_missile(location dest,miss_num_t missile_type,short path_type,short x_adj,short y_adj) {
 	if(!boom_anim_active)
 		return;
-	if(!get_bool_pref("DrawTerrainFrills", true))
-		return;
 	// lose redundant missiles
 	for(short i = 0; i < 30; i++)
 		if((store_missiles[i].missile_type >= 0) && (dest == store_missiles[i].dest))
@@ -301,8 +299,6 @@ void mondo_boom(location l,short type,short snd) {
 }
 
 void add_explosion(location dest,short val_to_place,short place_type,short boom_type,short x_adj,short y_adj) {
-	if(!get_bool_pref("DrawTerrainFrills", true))
-		return;
 	if(!boom_anim_active)
 		return;
 	// lose redundant explosions

src/tools/prefs.mac.mm

@@ -25,9 +25,6 @@ typedef NS_ENUM(NSInteger) {
 NSUserDefaults* replayUserDefaults = nil;
 NSDictionary* prefsToRecord = @{
 	@"DisplayMode": @(kInt),
-	@"DrawTerrainAnimation": @(kBool),
-	@"DrawTerrainFrills": @(kBool),
-	@"DrawTerrainShoreFrills": @(kBool),
 	@"EasyMode": @(kBool),
 	@"GameRunBefore": @(kBool),
 	@"GameSpeed": @(kInt),

test/replays/long/Placeholder.xml

@@ -1,9 +1,6 @@
 <actions SHA="47b4456" Tag="v0.0.4" Status="modified" Repo="[email protected]:NQNStudios/cboe.git">
     <load_prefs>
         <![CDATA[DisplayMode = 5
-DrawTerrainAnimation = true
-DrawTerrainFrills = false
-DrawTerrainShoreFrills = true
 EasyMode = false
 GameRunBefore = true
 GameSpeed = 0

test/replays/short/Issue455.xml

@@ -1,9 +1,6 @@
 <actions SHA="47b4456" Tag="v0.0.4" Status="modified" Repo="[email protected]:NQNStudios/cboe.git">
     <load_prefs>
         <![CDATA[DisplayMode = 5
-DrawTerrainAnimation = true
-DrawTerrainFrills = false
-DrawTerrainShoreFrills = true
 EasyMode = false
 GameRunBefore = true
 GameSpeed = 0

test/replays/short/Placeholder.xml

@@ -1,9 +1,6 @@
 <actions SHA="47b4456" Tag="v0.0.4" Status="modified" Repo="[email protected]:NQNStudios/cboe.git">
     <load_prefs>
         <![CDATA[DisplayMode = 5
-DrawTerrainAnimation = true
-DrawTerrainFrills = false
-DrawTerrainShoreFrills = true
 EasyMode = false
 GameRunBefore = true
 GameSpeed = 0