(svn r11834) -Codechange: only include settings_type.h if needed.

src/ai/default/default.cpp

@@ -29,6 +29,7 @@
 #include "../../saveload.h"
 #include "../../player_func.h"
 #include "../../player_base.h"
+#include "../../settings_type.h"
 #include "default.h"
 
 #include "../../table/ai_rail.h"

src/aircraft_cmd.cpp

@@ -35,6 +35,7 @@
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/airport.cpp

@@ -6,11 +6,11 @@
 #include "openttd.h"
 #include "debug.h"
 #include "airport.h"
-#include "variables.h"
 #include "airport_movement.h"
 #include "core/bitmath_func.hpp"
 #include "core/alloc_func.hpp"
 #include "date_func.h"
+#include "settings_type.h"
 
 /* Uncomment this to print out a full report of the airport-structure
  * You should either use

src/airport_gui.cpp

@@ -14,7 +14,7 @@
 #include "depot.h"
 #include "sound_func.h"
 #include "window_func.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "player_func.h"

src/clear_cmd.cpp

@@ -17,6 +17,7 @@
 #include "functions.h"
 #include "economy_func.h"
 #include "viewport_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/console_cmds.cpp

@@ -32,6 +32,7 @@
 #include "string_func.h"
 #include "player_func.h"
 #include "player_base.h"
+#include "settings_type.h"
 
 #ifdef ENABLE_NETWORK
 	#include "table/strings.h"

src/currency.cpp

@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "currency.h"
 #include "news.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "date_func.h"
 
 #include "table/strings.h"

src/date.cpp

@@ -5,6 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "variables.h"
+#include "settings_type.h"
 #include "network/network.h"
 #include "network/network_data.h"
 #include "network/network_server.h"

src/disaster_cmd.cpp

@@ -32,6 +32,7 @@
 #include "player_func.h"
 #include "airport.h"
 #include "variables.h"
+#include "settings_type.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "functions.h"

src/dock_gui.cpp

@@ -11,7 +11,7 @@
 #include "window_gui.h"
 #include "station_gui.h"
 #include "command_func.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "water.h"
 #include "window_func.h"
 #include "vehicle_func.h"

src/elrail.cpp

@@ -49,7 +49,7 @@
 #include "openttd.h"
 #include "station_map.h"
 #include "viewport_func.h"
-#include "variables.h" /* ... same here */
+#include "settings_type.h"
 #include "landscape.h"
 #include "rail_type.h"
 #include "debug.h"

src/engine.cpp

@@ -25,6 +25,7 @@
 #include "autoreplace_base.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/engines.h"

src/genworld.cpp

@@ -22,6 +22,7 @@
 #include "date_func.h"
 #include "core/random_func.hpp"
 #include "engine.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 

src/genworld_gui.cpp

@@ -24,6 +24,7 @@
 #include "fios.h"
 #include "string_func.h"
 #include "gfx_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/gfx.cpp

@@ -16,6 +16,7 @@
 #include "video/video_driver.hpp"
 #include "strings_func.h"
 #include "core/math_func.hpp"
+#include "settings_type.h"
 
 #include "table/palettes.h"
 #include "table/sprites.h"

src/gfxinit.cpp

@@ -17,6 +17,7 @@
 #include "core/alloc_func.hpp"
 #include "core/bitmath_func.hpp"
 #include <string.h>
+#include "settings_type.h"
 
 #include "table/sprites.h"
 

src/heightmap.cpp

@@ -15,6 +15,7 @@
 #include "gfx_func.h"
 #include "core/alloc_func.hpp"
 #include "fios.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/industry_gui.cpp

@@ -22,6 +22,7 @@
 #include "strings_func.h"
 #include "map_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/intro_gui.cpp

@@ -17,6 +17,7 @@
 #include "window_func.h"
 #include "fios.h"
 #include "gfx_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/landscape.cpp

@@ -22,6 +22,7 @@
 #include "functions.h"
 #include "date_func.h"
 #include "vehicle_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 

src/main_gui.cpp

@@ -43,6 +43,7 @@
 #include "player_base.h"
 #include "player_func.h"
 #include "player_gui.h"
+#include "settings_type.h"
 
 #include "network/network.h"
 #include "network/network_data.h"

src/misc_cmd.cpp

@@ -21,6 +21,7 @@
 #include "player_func.h"
 #include "player_base.h"
 #include "player_gui.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/misc_gui.cpp

@@ -39,6 +39,7 @@
 #include "sound_func.h"
 #include "string_func.h"
 #include "player_gui.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/network/network.cpp

@@ -32,6 +32,7 @@ extern const char _openttd_revision[];
 #include "../window_func.h"
 #include "../string_func.h"
 #include "../player_func.h"
+#include "../settings_type.h"
 #ifdef DEBUG_DUMP_COMMANDS
 	#include "../core/alloc_func.hpp"
 #endif /* DEBUG_DUMP_COMMANDS */

src/network/network_gui.cpp

@@ -25,6 +25,7 @@
 #include "../string_func.h"
 #include "../gfx_func.h"
 #include "../player_func.h"
+#include "../settings_type.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"

src/network/network_server.cpp

@@ -25,6 +25,7 @@
 #include "../player_base.h"
 #include "../player_func.h"
 #include "../player_gui.h"
+#include "../settings_type.h"
 
 #include "table/strings.h"
 

src/network/network_udp.cpp

@@ -22,6 +22,7 @@
 #include "../string_func.h"
 #include "../player_base.h"
 #include "../player_func.h"
+#include "../settings_type.h"
 
 #include "core/udp.h"
 

src/newgrf.cpp

@@ -43,6 +43,7 @@
 #include "string_func.h"
 #include "road_func.h"
 #include "player_base.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/newgrf_commons.cpp

@@ -14,6 +14,7 @@
 #include "newgrf_commons.h"
 #include "tile_map.h"
 #include "station_map.h"
+#include "settings_type.h"
 
 /** Constructor of generic class
  * @param offset end of original data for this entity. i.e: houses = 110

src/newgrf_spritegroup.cpp

@@ -11,6 +11,7 @@
 #include "newgrf_spritegroup.h"
 #include "sprite.h"
 #include "date_func.h"
+#include "settings_type.h"
 
 static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item);
 

src/newgrf_town.cpp

@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "debug.h"
 #include "core/bitmath_func.hpp"
 #include "town.h"

src/news.h

@@ -50,6 +50,8 @@ void DrawNewsBorder(const Window *w);
 void InitNewsItemStructs();
 
 extern NewsItem _statusbar_news_item;
+extern uint32 _news_display_opt;
+extern bool _news_ticker_sound;
 
 /** Type of news. */
 enum NewsType {

src/news_gui.cpp

@@ -7,7 +7,7 @@
 #include "window_gui.h"
 #include "viewport_func.h"
 #include "news.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "transparency.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -52,6 +52,8 @@ typedef byte NewsID;
 #define INVALID_NEWS 255
 
 NewsItem _statusbar_news_item;
+uint32 _news_display_opt;
+bool _news_ticker_sound;
 static NewsItem _news_items[MAX_NEWS];      ///< The news FIFO queue
 static NewsID _current_news = INVALID_NEWS; ///< points to news item that should be shown next
 static NewsID _oldest_news = 0;             ///< points to first item in fifo queue

src/pathfind.cpp

@@ -13,7 +13,7 @@
 #include "rail_type.h"
 #include "debug.h"
 #include "tunnel_map.h"
-#include "variables.h"
+#include "settings_type.h"
 #include "depot.h"
 #include "tunnelbridge_map.h"
 #include "core/random_func.hpp"

src/player_gui.cpp

@@ -27,6 +27,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "string_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/rail_gui.cpp

@@ -26,6 +26,7 @@
 #include "date_func.h"
 #include "sound_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "bridge_map.h"
 #include "rail_map.h"

src/road_gui.cpp

@@ -22,6 +22,7 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/roadveh_cmd.cpp

@@ -41,6 +41,7 @@
 #include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/settings_internal.h

@@ -6,6 +6,7 @@
 #define SETTINGS_INTERNAL_H
 
 #include "saveload.h"
+#include "settings_type.h"
 
 /** Convention/Type of settings. This is then further specified if necessary
  * with the SLE_ (SLE_VAR/SLE_FILE) enums in saveload.h

src/ship_cmd.cpp

@@ -37,6 +37,7 @@
 #include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/smallmap_gui.cpp

@@ -27,6 +27,7 @@
 #include "core/endian_func.hpp"
 #include "vehicle_base.h"
 #include "sound_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/station.cpp

@@ -29,6 +29,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "variables.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/strings.cpp

@@ -35,6 +35,7 @@
 #include "player_func.h"
 #include "player_base.h"
 #include "fios.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/control_codes.h"

src/terraform_gui.cpp

@@ -21,6 +21,7 @@
 #include "unmovable_map.h"
 #include "textbuf_gui.h"
 #include "genworld.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/texteff.cpp

@@ -19,6 +19,7 @@
 #include "date_func.h"
 #include "functions.h"
 #include "viewport_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 

src/tgp.cpp

@@ -14,6 +14,7 @@
 #include "genworld.h"
 #include "core/alloc_func.hpp"
 #include "core/random_func.hpp"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/timetable_cmd.cpp

@@ -10,6 +10,7 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "vehicle_base.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/timetable_gui.cpp

@@ -17,6 +17,7 @@
 #include "string_func.h"
 #include "gfx_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/town_gui.cpp

@@ -20,6 +20,7 @@
 #include "strings_func.h"
 #include "economy_func.h"
 #include "core/alloc_func.hpp"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/train_cmd.cpp

@@ -46,6 +46,7 @@
 #include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/train_cmd.h"

src/tree_cmd.cpp

@@ -19,6 +19,7 @@
 #include "functions.h"
 #include "player_func.h"
 #include "sound_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/variables.h

@@ -5,7 +5,6 @@
 #ifndef VARIABLES_H
 #define VARIABLES_H
 
-#include "settings_type.h"
 #include "tile_type.h"
 #include "strings_type.h"
 
@@ -79,8 +78,6 @@ VARDEF int _autosave_ctr;
 
 VARDEF byte _display_opt;
 VARDEF int _caret_timer;
-VARDEF uint32 _news_display_opt;
-VARDEF bool _news_ticker_sound;
 
 VARDEF StringID _error_message;
 

src/vehicle.cpp

@@ -47,6 +47,7 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/vehicle_gui.cpp

@@ -34,6 +34,7 @@
 #include "autoreplace_gui.h"
 #include "core/alloc_func.hpp"
 #include "string_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/viewport.cpp

@@ -24,6 +24,7 @@
 #include "zoom_func.h"
 #include "vehicle_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/water_cmd.cpp

@@ -32,6 +32,7 @@
 #include "sound_func.h"
 #include "variables.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/waypoint.cpp

@@ -30,6 +30,7 @@
 #include "string_func.h"
 #include "signal_func.h"
 #include "player_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 

src/window.cpp

@@ -18,6 +18,7 @@
 #include "core/alloc_func.hpp"
 #include "map_func.h"
 #include "vehicle_base.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"