(svn r11834) -Codechange: only include settings_type.h if needed.
--- a/src/ai/default/default.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/ai/default/default.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/aircraft_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/aircraft_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/airport.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/airport.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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
--- a/src/airport_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/airport_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/clear_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/clear_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/console_cmds.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/console_cmds.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/currency.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/currency.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/date.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/date.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/disaster_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/disaster_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/dock_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/dock_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/elrail.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/elrail.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/engine.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/engine.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/genworld.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/genworld.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -22,6 +22,7 @@
#include "date_func.h"
#include "core/random_func.hpp"
#include "engine.h"
+#include "settings_type.h"
#include "table/sprites.h"
--- a/src/genworld_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/genworld_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/gfx.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/gfx.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/gfxinit.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/gfxinit.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/heightmap.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/heightmap.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -15,6 +15,7 @@
#include "gfx_func.h"
#include "core/alloc_func.hpp"
#include "fios.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/industry_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/industry_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/intro_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/intro_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/landscape.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/landscape.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -22,6 +22,7 @@
#include "functions.h"
#include "date_func.h"
#include "vehicle_func.h"
+#include "settings_type.h"
#include "table/sprites.h"
--- a/src/main_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/main_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/misc_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/misc_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -21,6 +21,7 @@
#include "player_func.h"
#include "player_base.h"
#include "player_gui.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/misc_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/misc_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/network/network.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/network/network.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -32,6 +32,7 @@
#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 */
--- a/src/network/network_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/network/network_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/network/network_server.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/network/network_server.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -25,6 +25,7 @@
#include "../player_base.h"
#include "../player_func.h"
#include "../player_gui.h"
+#include "../settings_type.h"
#include "table/strings.h"
--- a/src/network/network_udp.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/network/network_udp.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -22,6 +22,7 @@
#include "../string_func.h"
#include "../player_base.h"
#include "../player_func.h"
+#include "../settings_type.h"
#include "core/udp.h"
--- a/src/newgrf.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/newgrf.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/newgrf_commons.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/newgrf_commons.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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
--- a/src/newgrf_spritegroup.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/newgrf_spritegroup.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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);
--- a/src/newgrf_town.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/newgrf_town.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/news.h Sun Jan 13 13:53:53 2008 +0000
+++ b/src/news.h Sun Jan 13 14:37:30 2008 +0000
@@ -50,6 +50,8 @@
void InitNewsItemStructs();
extern NewsItem _statusbar_news_item;
+extern uint32 _news_display_opt;
+extern bool _news_ticker_sound;
/** Type of news. */
enum NewsType {
--- a/src/news_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/news_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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 @@
#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
--- a/src/pathfind.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/pathfind.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/player_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/player_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/rail_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/rail_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/road_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/road_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/roadveh_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/roadveh_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -41,6 +41,7 @@
#include "variables.h"
#include "autoreplace_gui.h"
#include "gfx_func.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/settings_internal.h Sun Jan 13 13:53:53 2008 +0000
+++ b/src/settings_internal.h Sun Jan 13 14:37:30 2008 +0000
@@ -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
--- a/src/ship_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/ship_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -37,6 +37,7 @@
#include "variables.h"
#include "autoreplace_gui.h"
#include "gfx_func.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/smallmap_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/smallmap_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/station.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/station.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/strings.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/strings.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/terraform_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/terraform_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/texteff.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/texteff.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -19,6 +19,7 @@
#include "date_func.h"
#include "functions.h"
#include "viewport_func.h"
+#include "settings_type.h"
#include "table/sprites.h"
--- a/src/tgp.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/tgp.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/timetable_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/timetable_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -10,6 +10,7 @@
#include "window_func.h"
#include "vehicle_func.h"
#include "vehicle_base.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/timetable_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/timetable_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -17,6 +17,7 @@
#include "string_func.h"
#include "gfx_func.h"
#include "player_func.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/town_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/town_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/train_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/train_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/tree_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/tree_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/variables.h Sun Jan 13 13:53:53 2008 +0000
+++ b/src/variables.h Sun Jan 13 14:37:30 2008 +0000
@@ -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 byte _display_opt;
VARDEF int _caret_timer;
-VARDEF uint32 _news_display_opt;
-VARDEF bool _news_ticker_sound;
VARDEF StringID _error_message;
--- a/src/vehicle.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/vehicle.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/vehicle_gui.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/vehicle_gui.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/viewport.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/viewport.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/water_cmd.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/water_cmd.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"
--- a/src/waypoint.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/waypoint.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -30,6 +30,7 @@
#include "string_func.h"
#include "signal_func.h"
#include "player_func.h"
+#include "settings_type.h"
#include "table/strings.h"
--- a/src/window.cpp Sun Jan 13 13:53:53 2008 +0000
+++ b/src/window.cpp Sun Jan 13 14:37:30 2008 +0000
@@ -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"