Mercurial > hg > openttd
changeset 18891:88567087417f draft
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
line wrap: on
line diff
--- a/src/ai/ai_config.cpp +++ b/src/ai/ai_config.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../settings_type.h" -#include "../core/random_func.hpp" #include "ai.hpp" #include "ai_config.hpp" #include "ai_info.hpp"
--- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -16,15 +16,11 @@ #include "../company_func.h" #include "../network/network.h" #include "../window_func.h" -#include "../command_func.h" -#include "../fileio_func.h" #include "ai_scanner.hpp" #include "ai_instance.hpp" #include "ai_config.hpp" #include "ai_info.hpp" #include "ai.hpp" -#include "../script/script_storage.hpp" -#include "../script/api/script_error.hpp" /* static */ uint AI::frame_counter = 0; /* static */ AIScannerInfo *AI::scanner_info = NULL;
--- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -14,7 +14,6 @@ #include "../error.h" #include "../gui.h" #include "../querystring_gui.h" -#include "../company_func.h" #include "../company_base.h" #include "../company_gui.h" #include "../strings_func.h" @@ -24,7 +23,6 @@ #include "../network/network.h" #include "../settings_func.h" #include "../network/network_content.h" -#include "../core/backup_type.hpp" #include "ai.hpp" #include "../script/api/script_log.hpp" @@ -36,7 +34,6 @@ #include "../game/game_info.hpp" #include "../game/game_instance.hpp" -#include "../widgets/ai_widget.h" #include "table/strings.h"
--- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -11,14 +11,11 @@ #include "../stdafx.h" -#include "../script/squirrel_helper.hpp" #include "../script/squirrel_class.hpp" #include "ai_info.hpp" #include "ai_scanner.hpp" -#include "../settings_type.h" #include "../debug.h" #include "../rev.h" -#include "ai.hpp" /** * Check if the API version provided by the AI is supported.
--- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../debug.h" -#include "../saveload/saveload.h" #include "../error.h" #include "../script/squirrel_class.hpp" @@ -20,8 +19,6 @@ #include "ai_gui.hpp" #include "ai.hpp" -#include "../script/script_fatalerror.hpp" -#include "../script/script_suspend.hpp" #include "../script/script_storage.hpp" #include "ai_info.hpp" #include "ai_instance.hpp"
--- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -11,14 +11,12 @@ #include "../stdafx.h" #include "../debug.h" -#include "../fileio_func.h" #include "../network/network.h" #include "../core/random_func.hpp" #include "../script/squirrel_class.hpp" #include "ai_info.hpp" #include "ai_scanner.hpp" -#include "../script/api/script_controller.hpp" AIScannerInfo::AIScannerInfo() :
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -16,7 +16,6 @@ #include "aircraft.h" #include "landscape.h" #include "news_func.h" -#include "vehicle_gui.h" #include "newgrf_engine.h" #include "newgrf_sound.h" #include "spritecache.h"
--- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -27,11 +27,9 @@ #include "core/geometry_func.hpp" #include "hotkeys.h" #include "vehicle_func.h" -#include "sprite.h" #include "widgets/airport_widget.h" -#include "table/strings.h" static AirportClassID _selected_airport_class; ///< the currently visible airport class static int _selected_airport_index; ///< the index of the selected airport in the current class or -1
--- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -18,7 +18,6 @@ #include "newgrf.h" #include "table/strings.h" -#include "table/sprites.h" static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts per vehicle, i.e. when to abort calling the articulated vehicle callback.
--- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -17,7 +17,6 @@ #include "vehicle_func.h" #include "autoreplace_func.h" #include "autoreplace_gui.h" -#include "group.h" #include "articulated_vehicles.h" #include "core/random_func.hpp"
--- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -13,7 +13,6 @@ #include "command_func.h" #include "vehicle_gui.h" #include "newgrf_engine.h" -#include "group.h" #include "rail.h" #include "strings_func.h" #include "window_func.h" @@ -28,7 +27,6 @@ #include "widgets/autoreplace_widget.h" -#include "table/strings.h" uint GetEngineListHeight(VehicleType type); void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *eng_list, uint16 min, uint16 max, EngineID selected_id, bool show_count, GroupID selected_group);
--- a/src/blitter/32bpp_anim.cpp +++ b/src/blitter/32bpp_anim.cpp @@ -10,7 +10,6 @@ /** @file 32bpp_anim.cpp Implementation of the optimized 32 bpp blitter with animation support. */ #include "../stdafx.h" -#include "../core/math_func.hpp" #include "../video/video_driver.hpp" #include "32bpp_anim.hpp"
--- a/src/blitter/32bpp_optimized.cpp +++ b/src/blitter/32bpp_optimized.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../zoom_func.h" #include "../settings_type.h" -#include "../core/math_func.hpp" #include "32bpp_optimized.hpp" /** Instantiation of the optimized 32bpp blitter factory. */
--- a/src/bootstrap_gui.cpp +++ b/src/bootstrap_gui.cpp @@ -16,7 +16,6 @@ #if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) #include "core/geometry_func.hpp" -#include "fileio_func.h" #include "fontcache.h" #include "gfx_func.h" #include "network/network.h" @@ -25,7 +24,6 @@ #include "strings_func.h" #include "video/video_driver.hpp" #include "window_func.h" -#include "window_gui.h" #include "widgets/bootstrap_widget.h"
--- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "cargotype.h" -#include "core/bitmath_func.hpp" #include "newgrf_cargo.h" #include "string_func.h" #include "strings_func.h"
--- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -18,18 +18,15 @@ #include "saveload/saveload.h" #include "textbuf_gui.h" #include "window_gui.h" -#include "newgrf.h" #include "string_func.h" #include "strings_func.h" #include "window_func.h" #include "rail_gui.h" #include "gui.h" #include "company_gui.h" -#include "gamelog.h" #include "widgets/cheat_widget.h" -#include "table/strings.h" #include "table/sprites.h"
--- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -14,9 +14,6 @@ #include "command_func.h" #include "landscape.h" #include "genworld.h" -#include "landscape_type.h" -#include "clear_func.h" -#include "economy_func.h" #include "viewport_func.h" #include "water.h" #include "core/random_func.hpp"
--- a/src/command.cpp +++ b/src/command.cpp @@ -17,9 +17,7 @@ #include "network/network_type.h" #include "network/network.h" #include "genworld.h" -#include "newgrf_storage.h" #include "strings_func.h" -#include "gfx_func.h" #include "texteff.hpp" #include "town.h" #include "date_func.h"
--- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -10,7 +10,6 @@ /** @file company_cmd.cpp Handling of companies. */ #include "stdafx.h" -#include "engine_base.h" #include "company_base.h" #include "company_func.h" #include "company_gui.h" @@ -18,8 +17,6 @@ #include "news_func.h" #include "cmd_helper.h" #include "command_func.h" -#include "network/network.h" -#include "network/network_func.h" #include "network/network_base.h" #include "network/network_admin.h" #include "ai/ai.hpp" @@ -33,11 +30,9 @@ #include "settings_func.h" #include "vehicle_base.h" #include "vehicle_func.h" -#include "sprite.h" #include "smallmap_gui.h" #include "game/game.hpp" -#include "table/strings.h" CompanyByte _local_company; ///< Company controlled by the human player at this client. Can also be #COMPANY_SPECTATOR. CompanyByte _current_company; ///< Company currently doing an action.
--- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -20,17 +20,14 @@ #include "network/network.h" #include "network/network_gui.h" #include "network/network_func.h" -#include "vehicle_func.h" #include "newgrf.h" #include "company_manager_face.h" #include "strings_func.h" #include "date_func.h" #include "widgets/dropdown_type.h" #include "tilehighlight_func.h" -#include "sprite.h" #include "company_base.h" #include "core/geometry_func.hpp" -#include "economy_func.h" #include "object_type.h" #include "rail.h" #include "engine_base.h" @@ -41,7 +38,6 @@ #include "widgets/company_widget.h" -#include "table/strings.h" /** Company GUI constants. */ static const uint EXP_LINESPACE = 2; ///< Amount of vertical space for a horizontal (sub-)total line.
--- a/src/console.cpp +++ b/src/console.cpp @@ -11,10 +11,7 @@ #include "stdafx.h" #include "console_internal.h" -#include "network/network.h" -#include "network/network_func.h" #include "network/network_admin.h" -#include "debug.h" #include "console_func.h" #include "settings_type.h"
--- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -11,12 +11,9 @@ #include "stdafx.h" #include "console_internal.h" -#include "debug.h" #include "engine_func.h" #include "landscape.h" #include "saveload/saveload.h" -#include "network/network.h" -#include "network/network_func.h" #include "network/network_base.h" #include "network/network_admin.h" #include "network/network_client.h"
--- a/src/date_gui.cpp +++ b/src/date_gui.cpp @@ -20,7 +20,6 @@ #include "widgets/dropdown_type.h" #include "widgets/date_widget.h" -#include "table/strings.h" /** Window to select a date graphically by using dropdowns */ struct SetDateWindow : Window {
--- a/src/debug.cpp +++ b/src/debug.cpp @@ -12,8 +12,6 @@ #include "stdafx.h" #include <stdarg.h> #include "console_func.h" -#include "debug.h" -#include "string_func.h" #include "fileio_func.h" #include "settings_type.h"
--- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -18,10 +18,8 @@ #include "viewport_func.h" #include "command_func.h" #include "depot_base.h" -#include "vehicle_gui.h" #include "spritecache.h" #include "strings_func.h" -#include "window_func.h" #include "vehicle_func.h" #include "company_func.h" #include "tilehighlight_func.h"
--- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -15,7 +15,6 @@ #include "station_gui.h" #include "command_func.h" #include "water.h" -#include "water_map.h" #include "window_func.h" #include "vehicle_func.h" #include "sound_func.h" @@ -25,9 +24,7 @@ #include "slope_func.h" #include "tilehighlight_func.h" #include "company_base.h" -#include "station_type.h" #include "hotkeys.h" -#include "bridge.h" #include "widgets/dock_widget.h"
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -17,7 +17,6 @@ #include "news_func.h" #include "network/network.h" #include "network/network_func.h" -#include "vehicle_gui.h" #include "ai/ai.hpp" #include "aircraft.h" #include "newgrf_engine.h" @@ -29,9 +28,7 @@ #include "newgrf_station.h" #include "newgrf_airporttiles.h" #include "object.h" -#include "group.h" #include "strings_func.h" -#include "window_func.h" #include "date_func.h" #include "vehicle_func.h" #include "sound_func.h" @@ -44,7 +41,6 @@ #include "waypoint_base.h" #include "economy_base.h" #include "core/pool_func.hpp" -#include "newgrf.h" #include "core/backup_type.hpp" #include "water.h" #include "game/game.hpp"
--- a/src/effectvehicle.cpp +++ b/src/effectvehicle.cpp @@ -19,7 +19,6 @@ #include "effectvehicle_func.h" #include "effectvehicle_base.h" -#include "table/sprites.h" static void ChimneySmokeInit(EffectVehicle *v) {
--- a/src/engine.cpp +++ b/src/engine.cpp @@ -16,7 +16,6 @@ #include "aircraft.h" #include "newgrf.h" #include "newgrf_engine.h" -#include "group.h" #include "strings_func.h" #include "core/random_func.hpp" #include "window_func.h"
--- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "window_gui.h" -#include "gfx_func.h" #include "engine_base.h" #include "command_func.h" #include "strings_func.h"
--- a/src/game/game_config.cpp +++ b/src/game/game_config.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../settings_type.h" -#include "../core/random_func.hpp" #include "game.hpp" #include "game_config.hpp" #include "game_info.hpp"
--- a/src/game/game_core.cpp +++ b/src/game/game_core.cpp @@ -10,14 +10,11 @@ /** @file game_core.cpp Implementation of Game. */ #include "../stdafx.h" -#include "../command_func.h" #include "../core/backup_type.hpp" -#include "../core/bitmath_func.hpp" #include "../company_base.h" #include "../company_func.h" #include "../network/network.h" #include "../window_func.h" -#include "../fileio_func.h" #include "game.hpp" #include "game_scanner.hpp" #include "game_config.hpp"
--- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -11,14 +11,10 @@ #include "../stdafx.h" -#include "../script/squirrel_helper.hpp" #include "../script/squirrel_class.hpp" #include "game_info.hpp" #include "game_scanner.hpp" -#include "../settings_type.h" #include "../debug.h" -#include "../rev.h" -#include "game.hpp" /** * Check if the API version provided by the Game is supported.
--- a/src/game/game_instance.cpp +++ b/src/game/game_instance.cpp @@ -10,9 +10,7 @@ /** @file game_instance.cpp Implementation of GameInstance. */ #include "../stdafx.h" -#include "../debug.h" #include "../error.h" -#include "../saveload/saveload.h" #include "../script/squirrel_class.hpp"
--- a/src/game/game_scanner.cpp +++ b/src/game/game_scanner.cpp @@ -10,15 +10,10 @@ /** @file game_scanner.cpp allows scanning Game scripts */ #include "../stdafx.h" -#include "../debug.h" -#include "../fileio_func.h" -#include "../network/network.h" -#include "../core/random_func.hpp" #include "../script/squirrel_class.hpp" #include "game_info.hpp" #include "game_scanner.hpp" -#include "../script/api/script_controller.hpp" void GameScannerInfo::Initialize()
--- a/src/game/game_text.cpp +++ b/src/game/game_text.cpp @@ -10,7 +10,6 @@ /** @file game_text.cpp Implementation of handling translated strings. */ #include "../stdafx.h" -#include "../language.h" #include "../strgen/strgen.h" #include "../debug.h" #include "../fileio_func.h" @@ -21,7 +20,6 @@ #include "table/strings.h" -#include <exception> #include <stdarg.h> void CDECL strgen_warning(const char *s, ...)
--- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -18,10 +18,8 @@ #include "network/network.h" #include "heightmap.h" #include "viewport_func.h" -#include "gfx_func.h" #include "date_func.h" #include "engine_func.h" -#include "newgrf_storage.h" #include "water.h" #include "video/video_driver.hpp" #include "tilehighlight_func.h" @@ -36,7 +34,6 @@ #include "game/game.hpp" #include "game/game_instance.hpp" -#include "table/sprites.h" void GenerateClearTile(); void GenerateIndustries();
--- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -22,7 +22,6 @@ #include "string_func.h" #include "widgets/dropdown_type.h" #include "widgets/dropdown_func.h" -#include "landscape_type.h" #include "querystring_gui.h" #include "town.h" #include "settings_func.h" @@ -33,8 +32,6 @@ #include "widgets/genworld_widget.h" -#include "table/strings.h" -#include "table/sprites.h" extern void MakeNewgameSettingsLive();
--- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -20,7 +20,6 @@ #include "settings_type.h" #include "network/network.h" #include "network/network_func.h" -#include "thread/thread.h" #include "window_func.h" #include "newgrf_debug.h"
--- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -23,7 +23,6 @@ #include "base_media_func.h" #include "table/sprites.h" -#include "table/strings.h" /** Whether the given NewGRFs must get a palette remap from windows to DOS or not. */ bool _palette_remap_grf[MAX_FILE_SLOTS];
--- a/src/goal.cpp +++ b/src/goal.cpp @@ -13,15 +13,9 @@ #include "company_func.h" #include "industry.h" #include "town.h" -#include "news_func.h" -#include "ai/ai.hpp" -#include "station_base.h" -#include "cargotype.h" -#include "strings_func.h" #include "window_func.h" #include "goal_base.h" #include "core/pool_func.hpp" -#include "core/random_func.hpp" #include "game/game.hpp" #include "command_func.h" #include "company_base.h" @@ -29,7 +23,6 @@ #include "gui.h" #include "network/network.h" -#include "table/strings.h" GoalID _new_goal_id;
--- a/src/goal_gui.cpp +++ b/src/goal_gui.cpp @@ -16,7 +16,6 @@ #include "strings_func.h" #include "date_func.h" #include "viewport_func.h" -#include "gfx_func.h" #include "gui.h" #include "goal_base.h" #include "core/geometry_func.hpp"
--- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -22,13 +22,13 @@ #include "gfx_func.h" #include "sortlist_type.h" #include "core/geometry_func.hpp" -#include "math.h" #include "currency.h" #include "widgets/graph_widget.h" #include "table/strings.h" #include "table/sprites.h" +#include <math.h> /* Bitmasks of company and cargo indices that shouldn't be drawn. */ static uint _legend_excluded_companies;
--- a/src/ground_vehicle.cpp +++ b/src/ground_vehicle.cpp @@ -12,8 +12,6 @@ #include "stdafx.h" #include "train.h" #include "roadveh.h" -#include "vehicle_gui.h" -#include "window_func.h" /** * Recalculates the cached total power of a vehicle. Should be called when the consist is changed.
--- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -12,11 +12,8 @@ #include "stdafx.h" #include "cmd_helper.h" #include "command_func.h" -#include "group.h" #include "train.h" -#include "vehicle_gui.h" #include "vehiclelist.h" -#include "window_func.h" #include "vehicle_func.h" #include "autoreplace_base.h" #include "autoreplace_func.h"
--- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -14,7 +14,6 @@ #include "command_func.h" #include "vehicle_gui.h" #include "vehicle_base.h" -#include "group.h" #include "string_func.h" #include "strings_func.h" #include "window_func.h" @@ -29,7 +28,6 @@ #include "widgets/group_widget.h" -#include "table/strings.h" #include "table/sprites.h" typedef GUIList<const Group*> GUIGroupList;
--- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -13,7 +13,7 @@ #include "clear_map.h" #include "industry.h" #include "station_base.h" -#include "train.h" +#include "landscape.h" #include "viewport_func.h" #include "command_func.h" #include "town.h"
--- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -17,7 +17,6 @@ #include "textbuf_gui.h" #include "command_func.h" #include "viewport_func.h" -#include "gfx_func.h" #include "industry.h" #include "town.h" #include "cheat_type.h" @@ -40,7 +39,6 @@ #include "widgets/industry_widget.h" #include "table/strings.h" -#include "table/sprites.h" bool _ignore_restrictions; uint64 _displayed_industries; ///< Communication from the industry chain window to the smallmap window about what industries to display.
--- a/src/ini_load.cpp +++ b/src/ini_load.cpp @@ -13,7 +13,6 @@ #include "core/alloc_func.hpp" #include "core/mem_func.hpp" #include "ini_type.h" -#include "string_func.h" /** * Construct a new in-memory item of an Ini file.
--- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -29,8 +29,6 @@ #include "animated_tile_func.h" #include "core/random_func.hpp" #include "object_base.h" -#include "water_map.h" -#include "economy_func.h" #include "company_func.h" #include "pathfinder/npf/aystar.h" #include <list>
--- a/src/map.cpp +++ b/src/map.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "debug.h" #include "core/alloc_func.hpp" -#include "tile_map.h" #include "water_map.h" #if defined(_MSC_VER)
--- a/src/misc.cpp +++ b/src/misc.cpp @@ -16,7 +16,6 @@ #include "ai/ai_gui.hpp" #include "newgrf.h" #include "newgrf_house.h" -#include "group.h" #include "economy_func.h" #include "date_func.h" #include "texteff.hpp"
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -14,8 +14,6 @@ #include "landscape.h" #include "error.h" #include "gui.h" -#include "viewport_func.h" -#include "gfx_func.h" #include "command_func.h" #include "company_func.h" #include "town.h"
--- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -37,7 +37,6 @@ #include "../core/pool_func.hpp" #include "../gfx_func.h" #include "../error.h" -#include "table/strings.h" #ifdef DEBUG_DUMP_COMMANDS #include "../fileio_func.h"
--- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -14,12 +14,10 @@ #ifdef ENABLE_NETWORK #include "../stdafx.h" -#include "../gfx_func.h" #include "../strings_func.h" #include "../blitter/factory.hpp" #include "../console_func.h" #include "../video/video_driver.hpp" -#include "../table/sprites.h" #include "../querystring_gui.h" #include "../town.h" #include "../window_func.h"
--- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -12,7 +12,6 @@ #ifdef ENABLE_NETWORK #include "../stdafx.h" -#include "../debug.h" #include "network_gui.h" #include "../saveload/saveload.h" #include "../saveload/saveload_filter.h"
--- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -23,7 +23,6 @@ #include "../core/geometry_func.hpp" #include "network_content_gui.h" -#include "../widgets/network_content_widget.h" #include "table/strings.h" #include "../table/sprites.h"
--- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -21,7 +21,6 @@ #include "network_internal.h" #include "network_udp.h" #include "network_gamelist.h" -#include "../newgrf_text.h" NetworkGameList *_network_game_list = NULL;
--- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -29,7 +29,6 @@ #include "../sortlist_type.h" #include "../company_func.h" #include "../core/geometry_func.hpp" -#include "../newgrf_text.h" #include "../genworld.h" #include "../widgets/network_widget.h"
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -27,7 +27,6 @@ #include "../genworld.h" #include "../company_func.h" #include "../company_gui.h" -#include "../window_func.h" #include "../roadveh.h" #include "../order_backup.h" #include "../core/pool_func.hpp"
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -24,7 +24,6 @@ #include "fontcache.h" #include "currency.h" #include "landscape.h" -#include "newgrf.h" #include "newgrf_cargo.h" #include "newgrf_house.h" #include "newgrf_sound.h"
--- a/src/newgrf_airport.cpp +++ b/src/newgrf_airport.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "debug.h" #include "date_func.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" #include "newgrf_text.h" #include "station_base.h"
--- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -11,13 +11,11 @@ #include "stdafx.h" #include "debug.h" -#include "newgrf.h" #include "newgrf_airporttiles.h" #include "newgrf_spritegroup.h" #include "newgrf_sound.h" #include "station_base.h" #include "water.h" -#include "viewport_func.h" #include "landscape.h" #include "company_base.h" #include "town.h"
--- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -11,9 +11,7 @@ #include "stdafx.h" #include "debug.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" -#include "core/bitmath_func.hpp" static uint32 CargoGetRandomBits(const ResolverObject *object) {
--- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -17,7 +17,6 @@ #include "landscape.h" #include "house.h" #include "industrytype.h" -#include "newgrf.h" #include "newgrf_config.h" #include "clear_map.h" #include "station_map.h" @@ -27,7 +26,6 @@ #include "genworld.h" #include "newgrf_spritegroup.h" #include "newgrf_text.h" -#include "livery.h" #include "company_base.h" #include "error.h" #include "strings_func.h"
--- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -14,7 +14,6 @@ #include "train.h" #include "roadveh.h" #include "company_func.h" -#include "newgrf.h" #include "newgrf_cargo.h" #include "newgrf_spritegroup.h" #include "date_func.h"
--- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -11,12 +11,9 @@ #include "stdafx.h" #include "debug.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" #include "industrytype.h" -#include "core/bitmath_func.hpp" #include "core/random_func.hpp" -#include "tile_map.h" #include "newgrf_sound.h" #include "water_map.h" #include <list>
--- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -30,7 +30,6 @@ #include "widgets/newgrf_widget.h" -#include "table/strings.h" #include "table/sprites.h" /**
--- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -11,9 +11,7 @@ #include "stdafx.h" #include "debug.h" -#include "viewport_func.h" #include "landscape.h" -#include "newgrf.h" #include "newgrf_house.h" #include "newgrf_spritegroup.h" #include "newgrf_town.h" @@ -21,7 +19,6 @@ #include "company_func.h" #include "company_base.h" #include "town.h" -#include "sprite.h" #include "genworld.h" #include "newgrf_animation_base.h" #include "newgrf_cargo.h"
--- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -12,15 +12,12 @@ #include "stdafx.h" #include "debug.h" #include "industry.h" -#include "newgrf.h" #include "newgrf_industries.h" -#include "newgrf_text.h" #include "newgrf_town.h" #include "newgrf_cargo.h" #include "window_func.h" #include "town.h" #include "company_base.h" -#include "command_func.h" #include "error.h" #include "strings_func.h" #include "core/random_func.hpp"
--- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -11,17 +11,13 @@ #include "stdafx.h" #include "debug.h" -#include "viewport_func.h" #include "landscape.h" -#include "newgrf.h" #include "newgrf_industrytiles.h" #include "newgrf_sound.h" -#include "newgrf_text.h" #include "industry.h" #include "town.h" #include "command_func.h" #include "water.h" -#include "sprite.h" #include "newgrf_animation_base.h" #include "table/strings.h"
--- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -13,7 +13,6 @@ #include "company_base.h" #include "company_func.h" #include "debug.h" -#include "newgrf.h" #include "newgrf_class_func.h" #include "newgrf_object.h" #include "newgrf_sound.h" @@ -21,10 +20,8 @@ #include "newgrf_town.h" #include "object_base.h" #include "object_map.h" -#include "sprite.h" #include "tile_cmd.h" #include "town.h" -#include "viewport_func.h" #include "water.h" #include "newgrf_animation_base.h"
--- a/src/newgrf_railtype.cpp +++ b/src/newgrf_railtype.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "debug.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" #include "date_func.h" #include "depot_base.h"
--- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -10,9 +10,7 @@ /** @file newgrf_spritegroup.cpp Handling of primarily NewGRF action 2. */ #include "stdafx.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" -#include "sprite.h" #include "core/pool_func.hpp" SpriteGroupPool _spritegroup_pool("SpriteGroup");
--- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -23,7 +23,6 @@ #include "newgrf_town.h" #include "company_func.h" #include "tunnelbridge_map.h" -#include "newgrf.h" #include "newgrf_animation_base.h" #include "newgrf_class_func.h"
--- a/src/newgrf_town.cpp +++ b/src/newgrf_town.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "debug.h" #include "town.h" -#include "newgrf.h" #include "newgrf_spritegroup.h" /**
--- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "gui.h" #include "viewport_func.h" -#include "news_type.h" #include "strings_func.h" #include "window_func.h" #include "date_func.h"
--- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -25,7 +25,6 @@ #include "cheat_type.h" #include "object.h" #include "cargopacket.h" -#include "sprite.h" #include "core/random_func.hpp" #include "core/pool_func.hpp" #include "object_map.h"
--- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -14,7 +14,6 @@ #include "newgrf.h" #include "newgrf_object.h" #include "newgrf_text.h" -#include "sprite.h" #include "strings_func.h" #include "viewport_func.h" #include "window_gui.h"
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -19,8 +19,6 @@ #include "fontcache.h" #include "error.h" #include "gui.h" -#include "sound_func.h" -#include "window_func.h" #include "base_media_base.h" #include "saveload/saveload.h" @@ -36,13 +34,11 @@ #include "screenshot.h" #include "network/network.h" #include "network/network_func.h" -#include "signs_base.h" #include "ai/ai.hpp" #include "ai/ai_config.hpp" #include "settings_func.h" #include "genworld.h" #include "progress.h" -#include "group.h" #include "strings_func.h" #include "date_func.h" #include "vehicle_func.h" @@ -52,7 +48,6 @@ #include "elrail_func.h" #include "rev.h" #include "highscore.h" -#include "thread/thread.h" #include "station_base.h" #include "crashlog.h" #include "engine_func.h" @@ -66,12 +61,9 @@ #include "game/game_config.hpp" -#include "town.h" -#include "industry.h" #include <stdarg.h> -#include "table/strings.h" void CallLandscapeTick(); void IncreaseDate();
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -15,9 +15,7 @@ #include "command_func.h" #include "company_func.h" #include "news_func.h" -#include "vehicle_gui.h" #include "strings_func.h" -#include "window_func.h" #include "timetable.h" #include "vehicle_func.h" #include "depot_base.h"
--- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -13,11 +13,9 @@ #include "command_func.h" #include "viewport_func.h" #include "depot_map.h" -#include "vehicle_gui.h" #include "roadveh.h" #include "timetable.h" #include "strings_func.h" -#include "window_func.h" #include "company_func.h" #include "widgets/dropdown_type.h" #include "widgets/dropdown_func.h" @@ -33,7 +31,6 @@ #include "widgets/order_widget.h" -#include "table/strings.h" /** Order load types that could be given to station orders. */ static const StringID _station_load_types[][5][5] = {
--- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -10,7 +10,6 @@ /** @file npf.cpp Implementation of the NPF pathfinder. */ #include "../../stdafx.h" -#include "../../debug.h" #include "../../network/network.h" #include "../../viewport_func.h" #include "../../ship.h"
--- a/src/progress.cpp +++ b/src/progress.cpp @@ -10,7 +10,6 @@ /** @file progress.cpp Functions for modal progress windows. */ #include "stdafx.h" -#include "progress.h" #include "thread/thread.h" /** Are we in a modal progress or not? */
--- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -21,7 +21,6 @@ #include "autoslope.h" #include "water.h" #include "tunnelbridge_map.h" -#include "window_func.h" #include "vehicle_func.h" #include "sound_func.h" #include "tunnelbridge.h"
--- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -39,7 +39,6 @@ #include "widgets/rail_widget.h" -#include "table/strings.h" static RailType _cur_railtype; ///< Rail type of the current build-rail toolbar. static bool _remove_button_clicked; ///< Flag whether 'remove' toggle-button is currently enabled
--- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -19,7 +19,6 @@ #include "newgrf.h" #include "autoslope.h" #include "tunnelbridge_map.h" -#include "window_func.h" #include "strings_func.h" #include "vehicle_func.h" #include "sound_func.h"
--- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -16,13 +16,11 @@ #include "pathfinder/npf/npf_func.h" #include "station_base.h" #include "company_func.h" -#include "vehicle_gui.h" #include "articulated_vehicles.h" #include "newgrf_sound.h" #include "pathfinder/yapf/yapf.h" #include "strings_func.h" #include "tunnelbridge_map.h" -#include "window_func.h" #include "date_func.h" #include "vehicle_func.h" #include "sound_func.h"
--- a/src/roadveh_gui.cpp +++ b/src/roadveh_gui.cpp @@ -12,13 +12,10 @@ #include "stdafx.h" #include "roadveh.h" #include "window_gui.h" -#include "gfx_func.h" -#include "vehicle_gui.h" #include "strings_func.h" #include "vehicle_func.h" #include "string_func.h" -#include "table/sprites.h" #include "table/strings.h" /**
--- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -13,7 +13,6 @@ #include "../void_map.h" #include "../signs_base.h" #include "../depot_base.h" -#include "../window_func.h" #include "../fios.h" #include "../gamelog_internal.h" #include "../network/network.h" @@ -52,10 +51,8 @@ #include "../core/backup_type.hpp" #include "../smallmap_gui.h" #include "../news_func.h" -#include "../group.h" #include "../error.h" -#include "table/strings.h" #include "saveload_internal.h"
--- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -13,9 +13,6 @@ #include "../company_func.h" #include "../company_manager_face.h" #include "../fios.h" -#include "../rail_map.h" -#include "../road_map.h" -#include "../station_map.h" #include "../tunnelbridge_map.h" #include "../tunnelbridge.h" #include "../station_base.h"
--- a/src/saveload/game_sl.cpp +++ b/src/saveload/game_sl.cpp @@ -10,7 +10,6 @@ /** @file game_sl.cpp Handles the saveload part of the GameScripts */ #include "../stdafx.h" -#include "../company_base.h" #include "../debug.h" #include "saveload.h" #include "../string_func.h"
--- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../industry.h" -#include "../newgrf.h" #include "saveload.h" #include "newgrf_sl.h"
--- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../date_func.h" #include "../zoom_func.h" -#include "../vehicle_func.h" #include "../window_gui.h" #include "../window_func.h" #include "../viewport_func.h"
--- a/src/saveload/newgrf_sl.cpp +++ b/src/saveload/newgrf_sl.cpp @@ -10,7 +10,6 @@ /** @file newgrf_sl.cpp Code handling saving and loading of newgrf config */ #include "../stdafx.h" -#include "../core/bitmath_func.hpp" #include "../fios.h" #include "saveload.h"
--- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -39,7 +39,6 @@ #include "../fileio_func.h" #include "../gamelog.h" #include "../string_func.h" -#include "../engine_base.h" #include "../fios.h" #include "../error.h"
--- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -15,7 +15,6 @@ #include "../roadstop_base.h" #include "../vehicle_base.h" #include "../newgrf_station.h" -#include "../newgrf.h" #include "saveload.h" #include "table/strings.h"
--- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -10,7 +10,6 @@ /** @file screenshot.cpp The creation of screenshots! */ #include "stdafx.h" -#include "fileio_func.h" #include "viewport_func.h" #include "gfx_func.h" #include "screenshot.h"
--- a/src/script/api/script_admin.cpp +++ b/src/script/api/script_admin.cpp @@ -14,7 +14,6 @@ #include "script_log.hpp" #include "../../network/network_admin.h" #include "../script_instance.hpp" -#include "../../game/game.hpp" /* static */ bool ScriptAdmin::MakeJSON(HSQUIRRELVM vm, SQInteger index, int max_depth, std::string &data) {
--- a/src/script/api/script_bridge.cpp +++ b/src/script/api/script_bridge.cpp @@ -15,7 +15,6 @@ #include "../script_instance.hpp" #include "../../bridge_map.h" #include "../../strings_func.h" -#include "../../economy_func.h" #include "../../date_func.h" /* static */ bool ScriptBridge::IsValidBridge(BridgeID bridge_id)
--- a/src/script/api/script_cargo.cpp +++ b/src/script/api/script_cargo.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "script_cargo.hpp" -#include "../../cargotype.h" #include "../../economy_func.h" #include "../../core/bitmath_func.hpp"
--- a/src/script/api/script_company.cpp +++ b/src/script/api/script_company.cpp @@ -12,7 +12,6 @@ #include "../../stdafx.h" #include "script_company.hpp" #include "script_error.hpp" -#include "../../command_func.h" #include "../../company_func.h" #include "../../company_base.h" #include "../../company_manager_face.h"
--- a/src/script/api/script_companymode.cpp +++ b/src/script/api/script_companymode.cpp @@ -11,10 +11,6 @@ #include "../../stdafx.h" #include "script_companymode.hpp" -#include "../../company_base.h" -#include "../../company_func.h" -#include "../script_instance.hpp" -#include "../script_fatalerror.hpp" ScriptCompanyMode::ScriptCompanyMode(int company) {
--- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -18,7 +18,6 @@ #include "../script_fatalerror.hpp" #include "../script_info.hpp" #include "../script_instance.hpp" -#include "../script_suspend.hpp" #include "script_log.hpp" /* static */ void ScriptController::SetCommandDelay(int ticks)
--- a/src/script/api/script_engine.cpp +++ b/src/script/api/script_engine.cpp @@ -12,7 +12,6 @@ #include "../../stdafx.h" #include "script_engine.hpp" #include "script_cargo.hpp" -#include "../../company_func.h" #include "../../company_base.h" #include "../../strings_func.h" #include "../../rail.h"
--- a/src/script/api/script_enginelist.cpp +++ b/src/script/api/script_enginelist.cpp @@ -12,7 +12,6 @@ #include "../../stdafx.h" #include "script_enginelist.hpp" #include "../../engine_base.h" -#include "../../core/bitmath_func.hpp" ScriptEngineList::ScriptEngineList(ScriptVehicle::VehicleType vehicle_type) {
--- a/src/script/api/script_event_types.cpp +++ b/src/script/api/script_event_types.cpp @@ -13,7 +13,6 @@ #include "script_event_types.hpp" #include "script_vehicle.hpp" #include "script_log.hpp" -#include "../../command_type.h" #include "../../strings_func.h" #include "../../settings_type.h" #include "../../engine_base.h"
--- a/src/script/api/script_execmode.cpp +++ b/src/script/api/script_execmode.cpp @@ -11,8 +11,6 @@ #include "../../stdafx.h" #include "script_execmode.hpp" -#include "../../company_base.h" -#include "../../company_func.h" #include "../script_instance.hpp" #include "../script_fatalerror.hpp"
--- a/src/script/api/script_game.cpp +++ b/src/script/api/script_game.cpp @@ -13,7 +13,6 @@ #include "script_game.hpp" #include "../../command_type.h" #include "../../settings_type.h" -#include "../../openttd.h" #include "../../network/network.h" /* static */ bool ScriptGame::Pause()
--- a/src/script/api/script_goal.cpp +++ b/src/script/api/script_goal.cpp @@ -16,10 +16,6 @@ #include "script_map.hpp" #include "script_town.hpp" #include "../script_instance.hpp" -#include "../../command_type.h" -#include "../../settings_type.h" -#include "../../openttd.h" -#include "../../network/network.h" #include "../../goal_base.h" #include "../../string_func.h"
--- a/src/script/api/script_group.cpp +++ b/src/script/api/script_group.cpp @@ -13,8 +13,6 @@ #include "script_group.hpp" #include "script_engine.hpp" #include "../script_instance.hpp" -#include "../../company_func.h" -#include "../../group.h" #include "../../string_func.h" #include "../../strings_func.h" #include "../../autoreplace_func.h"
--- a/src/script/api/script_grouplist.cpp +++ b/src/script/api/script_grouplist.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "script_grouplist.hpp" -#include "../../company_func.h" #include "../../group.h" ScriptGroupList::ScriptGroupList()
--- a/src/script/api/script_infrastructure.cpp +++ b/src/script/api/script_infrastructure.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "script_infrastructure.hpp" -#include "../../settings_func.h" #include "../../company_base.h" #include "../../rail.h" #include "../../road_func.h"
--- a/src/script/api/script_news.cpp +++ b/src/script/api/script_news.cpp @@ -12,11 +12,8 @@ #include "../../stdafx.h" #include "script_news.hpp" #include "script_error.hpp" -#include "../../news_func.h" -#include "../../strings_func.h" #include "../../command_type.h" #include "../../string_func.h" -#include "table/strings.h" /* static */ bool ScriptNews::Create(NewsType type, Text *text, ScriptCompany::CompanyID company) {
--- a/src/script/api/script_object.cpp +++ b/src/script/api/script_object.cpp @@ -15,14 +15,11 @@ #include "../../company_func.h" #include "../../company_base.h" #include "../../network/network.h" -#include "../../tunnelbridge.h" #include "../../genworld.h" -#include "../../goal_type.h" #include "../script_storage.hpp" #include "../script_instance.hpp" #include "../script_fatalerror.hpp" -#include "../script_suspend.hpp" #include "script_error.hpp" /**
--- a/src/script/api/script_order.cpp +++ b/src/script/api/script_order.cpp @@ -11,7 +11,6 @@ #include "../../stdafx.h" #include "script_order.hpp" -#include "script_vehicle.hpp" #include "script_cargo.hpp" #include "script_map.hpp" #include "../script_instance.hpp"
--- a/src/script/api/script_rail.cpp +++ b/src/script/api/script_rail.cpp @@ -17,7 +17,6 @@ #include "script_cargo.hpp" #include "../../debug.h" #include "../../station_base.h" -#include "../../newgrf.h" #include "../../newgrf_generic.h" #include "../../newgrf_station.h" #include "../../strings_func.h"
--- a/src/script/api/script_sign.cpp +++ b/src/script/api/script_sign.cpp @@ -13,8 +13,6 @@ #include "script_sign.hpp" #include "table/strings.h" #include "../script_instance.hpp" -#include "../../command_func.h" -#include "../../core/alloc_func.hpp" #include "../../signs_base.h" #include "../../string_func.h" #include "../../strings_func.h"
--- a/src/script/api/script_station.cpp +++ b/src/script/api/script_station.cpp @@ -11,10 +11,8 @@ #include "../../stdafx.h" #include "script_station.hpp" -#include "script_cargo.hpp" #include "script_map.hpp" #include "script_town.hpp" -#include "../../debug.h" #include "../../station_base.h" #include "../../roadstop_base.h" #include "../../town.h"
--- a/src/script/api/script_testmode.cpp +++ b/src/script/api/script_testmode.cpp @@ -11,8 +11,6 @@ #include "../../stdafx.h" #include "script_testmode.hpp" -#include "../../company_base.h" -#include "../../company_func.h" #include "../script_instance.hpp" #include "../script_fatalerror.hpp"
--- a/src/script/api/script_text.cpp +++ b/src/script/api/script_text.cpp @@ -12,7 +12,6 @@ #include "../../stdafx.h" #include "../../string_func.h" #include "script_text.hpp" -#include "../squirrel.hpp" #include "../../table/control_codes.h" ScriptText::ScriptText(HSQUIRRELVM vm) :
--- a/src/script/api/script_tile.cpp +++ b/src/script/api/script_tile.cpp @@ -13,15 +13,12 @@ #include "script_tile.hpp" #include "script_map.hpp" #include "script_town.hpp" -#include "script_cargo.hpp" #include "../../station_func.h" -#include "../../company_func.h" #include "../../water_map.h" #include "../../clear_map.h" #include "../../tree_map.h" #include "../../town.h" #include "../../landscape.h" -#include "../../economy_func.h" /* static */ bool ScriptTile::IsBuildable(TileIndex tile) {
--- a/src/script/api/script_town.cpp +++ b/src/script/api/script_town.cpp @@ -12,11 +12,9 @@ #include "../../stdafx.h" #include "script_town.hpp" #include "script_map.hpp" -#include "script_cargo.hpp" #include "script_error.hpp" #include "../../town.h" #include "../../strings_func.h" -#include "../../company_func.h" #include "../../station_base.h" #include "../../landscape.h" #include "table/strings.h"
--- a/src/script/api/script_tunnel.cpp +++ b/src/script/api/script_tunnel.cpp @@ -14,8 +14,6 @@ #include "script_rail.hpp" #include "../script_instance.hpp" #include "../../tunnel_map.h" -#include "../../command_func.h" -#include "../../company_func.h" /* static */ bool ScriptTunnel::IsTunnelTile(TileIndex tile) {
--- a/src/script/script_config.cpp +++ b/src/script/script_config.cpp @@ -13,7 +13,6 @@ #include "../settings_type.h" #include "../core/random_func.hpp" #include "script_info.hpp" -#include "script_config.hpp" void ScriptConfig::Change(const char *name, int version, bool force_exact_match, bool is_random) {
--- a/src/script/script_info_dummy.cpp +++ b/src/script/script_info_dummy.cpp @@ -14,7 +14,6 @@ #include "../string_func.h" #include "../strings_func.h" -#include "table/strings.h" /* The reason this exists in C++, is that a user can trash his ai/ or game/ dir, * leaving no Scripts available. The complexity to solve this is insane, and
--- a/src/script/script_instance.cpp +++ b/src/script/script_instance.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../debug.h" #include "../saveload/saveload.h" -#include "../gui.h" #include "../script/squirrel_class.hpp" @@ -28,7 +27,6 @@ #include "../company_base.h" #include "../company_func.h" -#include "../fileio_func.h" ScriptStorage::~ScriptStorage() {
--- a/src/script/script_scanner.cpp +++ b/src/script/script_scanner.cpp @@ -12,9 +12,7 @@ #include "../stdafx.h" #include "../debug.h" #include "../string_func.h" -#include "../fileio_func.h" #include "../settings_type.h" -#include <sys/stat.h> #include "../script/squirrel.hpp" #include "script_scanner.hpp"
--- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -34,11 +34,7 @@ #include "ai/ai.hpp" #include "language.h" -#include "widgets/settings_widget.h" -#include "table/sprites.h" -#include "table/strings.h" -#include <map> static const StringID _units_dropdown[] = { STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL,
--- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -18,7 +18,6 @@ #include "pathfinder/npf/npf_func.h" #include "depot_base.h" #include "station_base.h" -#include "vehicle_gui.h" #include "newgrf_engine.h" #include "pathfinder/yapf/yapf.h" #include "newgrf_sound.h"
--- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -19,7 +19,6 @@ #include "strings_func.h" #include "window_func.h" #include "map_func.h" -#include "gfx_func.h" #include "viewport_func.h" #include "querystring_gui.h" #include "sortlist_type.h"
--- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -14,8 +14,6 @@ #include "viewport_func.h" #include "landscape.h" #include "spritecache.h" -#include "core/alloc_func.hpp" -#include "core/mem_func.hpp" #include "zoom_func.h"
--- a/src/station.cpp +++ b/src/station.cpp @@ -14,7 +14,6 @@ #include "company_base.h" #include "roadveh.h" #include "viewport_func.h" -#include "window_func.h" #include "date_func.h" #include "command_func.h" #include "news_func.h"
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -29,10 +29,8 @@ #include "road_internal.h" /* For drawing catenary/checking road removal */ #include "autoslope.h" #include "water.h" -#include "station_gui.h" #include "strings_func.h" #include "clear_func.h" -#include "window_func.h" #include "date_func.h" #include "vehicle_func.h" #include "string_func.h"
--- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -13,7 +13,6 @@ #include "../core/endian_func.hpp" #include "../string_func.h" #include "../strings_type.h" -#include "../language.h" #include "../misc/getoptdata.h" #include "../table/control_codes.h"
--- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -12,14 +12,10 @@ #include "../stdafx.h" #include "../core/endian_func.hpp" #include "../string_func.h" -#include "../strings_type.h" -#include "../language.h" #include "../table/control_codes.h" #include "strgen.h" -#include <stdarg.h> -#include <exception> #include "../table/strgen_tables.h"
--- a/src/strings.cpp +++ b/src/strings.cpp @@ -19,14 +19,11 @@ #include "industry.h" #include "newgrf_text.h" #include "fileio_func.h" -#include "group.h" #include "signs_base.h" -#include "cargotype.h" #include "fontcache.h" #include "error.h" #include "strings_func.h" #include "rev.h" -#include "core/alloc_type.hpp" #include "core/endian_func.hpp" #include "date_func.h" #include "vehicle_base.h"
--- a/src/subsidy.cpp +++ b/src/subsidy.cpp @@ -16,7 +16,6 @@ #include "news_func.h" #include "ai/ai.hpp" #include "station_base.h" -#include "cargotype.h" #include "strings_func.h" #include "window_func.h" #include "subsidy_base.h"
--- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -16,7 +16,6 @@ #include "strings_func.h" #include "date_func.h" #include "viewport_func.h" -#include "gfx_func.h" #include "gui.h" #include "subsidy_func.h" #include "subsidy_base.h"
--- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -14,7 +14,6 @@ #include "tunnel_map.h" #include "bridge_map.h" #include "viewport_func.h" -#include "economy_func.h" #include "genworld.h" #include "object_base.h" #include "company_base.h"
--- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -14,7 +14,6 @@ #include "clear_map.h" #include "void_map.h" #include "genworld.h" -#include "core/alloc_func.hpp" #include "core/random_func.hpp" #include "landscape_type.h"
--- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -22,7 +22,6 @@ #include "vehicle_func.h" #include "sound_func.h" #include "terraform_gui.h" -#include "transparency.h" #include "strings_func.h" #include "company_func.h" #include "company_gui.h" @@ -42,7 +41,6 @@ #include "newgrf_debug.h" #include "hotkeys.h" #include "engine_base.h" -#include "settings_type.h" #include "widgets/toolbar_widget.h" @@ -50,8 +48,6 @@ #include "network/network_gui.h" #include "network/network_func.h" -#include "table/strings.h" -#include "table/sprites.h" RailType _last_built_railtype; RoadType _last_built_roadtype;
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -26,7 +26,6 @@ #include "newgrf_debug.h" #include "newgrf_house.h" #include "newgrf_text.h" -#include "newgrf_config.h" #include "autoslope.h" #include "tunnelbridge_map.h" #include "strings_func.h" @@ -40,7 +39,6 @@ #include "core/pool_func.hpp" #include "town.h" #include "townname_func.h" -#include "townname_type.h" #include "core/random_func.hpp" #include "core/backup_type.hpp" #include "depot_base.h"
--- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -22,19 +22,15 @@ #include "string_func.h" #include "strings_func.h" #include "sound_func.h" -#include "economy_func.h" #include "tilehighlight_func.h" #include "sortlist_type.h" #include "road_cmd.h" #include "landscape.h" -#include "cargotype.h" #include "querystring_gui.h" #include "window_func.h" #include "townname_func.h" -#include "townname_type.h" #include "core/geometry_func.hpp" #include "genworld.h" -#include "sprite.h" #include "widgets/town_widget.h"
--- a/src/townname.cpp +++ b/src/townname.cpp @@ -13,7 +13,6 @@ #include "string_func.h" #include "townname_type.h" #include "town.h" -#include "core/alloc_func.hpp" #include "strings_func.h" #include "core/random_func.hpp" #include "genworld.h"
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -17,20 +17,16 @@ #include "pathfinder/yapf/yapf.hpp" #include "news_func.h" #include "company_func.h" -#include "vehicle_gui.h" #include "newgrf_sound.h" #include "newgrf_text.h" -#include "group.h" #include "strings_func.h" #include "viewport_func.h" -#include "window_func.h" #include "vehicle_func.h" #include "sound_func.h" #include "ai/ai.hpp" #include "game/game.hpp" #include "newgrf_station.h" #include "effectvehicle_func.h" -#include "gamelog.h" #include "network/network.h" #include "spritecache.h" #include "core/random_func.hpp"
--- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -11,15 +11,11 @@ #include "stdafx.h" #include "window_gui.h" -#include "gfx_func.h" #include "command_func.h" -#include "vehicle_gui.h" #include "train.h" #include "strings_func.h" #include "vehicle_func.h" -#include "window_func.h" -#include "table/sprites.h" #include "table/strings.h" /**
--- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -15,22 +15,17 @@ #include "tree_map.h" #include "viewport_func.h" #include "command_func.h" -#include "economy_func.h" #include "town.h" #include "genworld.h" -#include "transparency.h" #include "clear_func.h" #include "company_func.h" #include "sound_func.h" -#include "water_map.h" #include "water.h" -#include "landscape_type.h" #include "company_base.h" #include "core/random_func.hpp" #include "newgrf_generic.h" #include "table/strings.h" -#include "table/sprites.h" #include "table/tree_land.h" #include "table/clear_land.h"
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -22,7 +22,6 @@ #include "train.h" #include "ship.h" #include "roadveh.h" -#include "water_map.h" #include "pathfinder/yapf/yapf_cache.h" #include "newgrf_sound.h" #include "autoslope.h" @@ -42,7 +41,6 @@ #include "water.h" #include "company_gui.h" -#include "table/sprites.h" #include "table/strings.h" #include "table/bridge_land.h"
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -19,18 +19,15 @@ #include "news_func.h" #include "command_func.h" #include "company_func.h" -#include "vehicle_gui.h" #include "train.h" #include "aircraft.h" #include "newgrf_debug.h" #include "newgrf_sound.h" #include "newgrf_station.h" -#include "group.h" #include "group_gui.h" #include "strings_func.h" #include "zoom_func.h" #include "date_func.h" -#include "window_func.h" #include "vehicle_func.h" #include "autoreplace_func.h" #include "autoreplace_gui.h"
--- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -16,11 +16,9 @@ #include "cmd_helper.h" #include "command_func.h" #include "company_func.h" -#include "vehicle_gui.h" #include "train.h" #include "aircraft.h" #include "newgrf_text.h" -#include "window_func.h" #include "vehicle_func.h" #include "string_func.h" #include "depot_map.h" @@ -28,7 +26,7 @@ #include "engine_func.h" #include "articulated_vehicles.h" #include "autoreplace_gui.h" -#include "company_base.h" +#include "group.h" #include "order_backup.h" #include "ship.h" #include "newgrf.h"
--- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -15,7 +15,6 @@ #include "gui.h" #include "textbuf_gui.h" #include "command_func.h" -#include "vehicle_gui.h" #include "vehicle_gui_base.h" #include "viewport_func.h" #include "newgrf_text.h" @@ -26,7 +25,6 @@ #include "depot_map.h" #include "group_gui.h" #include "strings_func.h" -#include "window_func.h" #include "vehicle_func.h" #include "autoreplace_gui.h" #include "string_func.h" @@ -41,7 +39,6 @@ #include "tilehighlight_func.h" #include "zoom_func.h" -#include "table/strings.h" Sorting _sorting;