Remove 3 obsolete settings

rsrc/dialogs/preferences.xml

@@ -22,13 +22,7 @@
 		<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='nosound' relative='pos-in pos' anchor='spd-head' top='30' left='0' width='117'>No Sounds</led>
-	<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>
 	<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='easier' relative='pos-in pos' rel-anchor='prev' top='10' left='0' width='352'>Make game easier (monsters much weaker)</led>

src/game/boe.dlgutil.cpp

@@ -1188,7 +1188,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);
 		
@@ -1199,8 +1198,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?
@@ -1283,7 +1280,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) {
@@ -1293,8 +1289,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.graphics.cpp

@@ -685,7 +685,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;
@@ -857,7 +856,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]))
@@ -947,8 +946,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;
@@ -1087,7 +1084,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
@@ -1131,9 +1128,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;
@@ -1363,7 +1357,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

@@ -993,7 +993,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++;
@@ -1330,6 +1329,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))
@@ -158,7 +158,7 @@ void apply_light_mask(bool onWindow) {
 	rectangle big_to = {13+2,13+14,337+3,265+15};
 	//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;
@@ -261,8 +261,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))
@@ -305,8 +303,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="git@github.com: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="git@github.com:NQNStudios/cboe.git">
     <load_prefs>
         <![CDATA[DisplayMode = 5
-DrawTerrainAnimation = true
-DrawTerrainFrills = false
-DrawTerrainShoreFrills = true
 EasyMode = false
 GameRunBefore = true
 GameSpeed = 0