Remove 3 obsolete settings

This commit is contained in:
2024-11-24 15:31:06 -06:00
committed by Celtic Minstrel
parent 1375a2e6b1
commit 34dd31cf51
8 changed files with 7 additions and 40 deletions

View File

@@ -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;