From 71f4067d19b4d861b93bd5f6fe290d9d95eec4fd Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 4 Feb 2011 14:38:33 +0000 Subject: (svn r21956) -Cleanup: always draw the bridge pillars --- src/settings_type.h | 1 - src/table/settings.h | 1 - src/tunnelbridge_cmd.cpp | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/settings_type.h b/src/settings_type.h index 0faeb4407..3fe5690b3 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -85,7 +85,6 @@ struct GUISettings { Year coloured_news_year; ///< when does newspaper become coloured? bool timetable_in_ticks; ///< whether to show the timetable in ticks rather than days bool quick_goto; ///< Allow quick access to 'goto button' in vehicle orders window - bool bridge_pillars; ///< show bridge pillars for high bridges bool auto_euro; ///< automatically switch to euro in 2002 byte drag_signals_density; ///< many signals density Year semaphore_build_before; ///< build semaphore signals automatically before this year diff --git a/src/table/settings.h b/src/table/settings.h index 08a2d6f9c..f10fcbe19 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -602,7 +602,6 @@ const SettingDesc _settings[] = { SDTC_BOOL(gui.keep_all_autosave, S, 0, false, STR_NULL, NULL), SDTC_BOOL(gui.autosave_on_exit, S, 0, false, STR_NULL, NULL), SDTC_VAR(gui.max_num_autosaves, SLE_UINT8, S, 0, 16, 0, 255, 0, STR_NULL, NULL), - SDTC_BOOL(gui.bridge_pillars, S, 0, true, STR_NULL, NULL), SDTC_BOOL(gui.auto_euro, S, 0, true, STR_NULL, NULL), SDTC_VAR(gui.news_message_timeout, SLE_UINT8, S, 0, 2, 1, 255, 0, STR_NULL, NULL), SDTC_BOOL(gui.show_track_reservation, S, 0, false, STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION, RedrawScreen), diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 5ad2708a8..9c1bb6ca9 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1336,7 +1336,7 @@ void DrawBridgeMiddle(const TileInfo *ti) DrawGroundSpriteAt(image, pal, x - ti->x, y - ti->y, z - ti->z); } - } else if (_settings_client.gui.bridge_pillars) { + } else { /* draw pillars below for high bridges */ DrawBridgePillars(psid, ti, axis, drawfarpillar, x, y, z); } -- cgit v1.2.3-54-g00ecf