Mercurial > hg > openttd
changeset 13186:afdfdda87cd4 draft
(svn r17693) -Cleanup: remove some unneeded includes
line wrap: on
line diff
--- a/src/3rdparty/md5/md5.cpp +++ b/src/3rdparty/md5/md5.cpp @@ -57,7 +57,6 @@ */ #include "../../stdafx.h" -#include "../../core/bitmath_func.hpp" #include "../../core/endian_func.hpp" #include "md5.h"
--- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -15,7 +15,6 @@ #include "../company_func.h" #include "../debug.h" #include "../network/network.h" -#include "../settings_type.h" #include "../window_func.h" #include "../command_func.h" #include "ai.hpp"
--- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -20,9 +20,7 @@ #include "../gfx_func.h" #include "../command_func.h" #include "../network/network.h" -#include "../string_func.h" #include "../textbuf_gui.h" -#include "../settings_type.h" #include "../settings_func.h" #include "../network/network_content.h"
--- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../debug.h" -#include "../settings_type.h" #include "../vehicle_base.h" #include "../saveload/saveload.h" #include "../gui.h" @@ -21,11 +20,9 @@ #include "../script/squirrel.hpp" #include "../script/squirrel_helper.hpp" #include "../script/squirrel_class.hpp" -#include "../script/squirrel_std.hpp" #define DEFINE_SCRIPT_FILES -#include "ai_info.hpp" #include "ai_config.hpp" #include "ai_storage.hpp" #include "ai_instance.hpp"
--- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -11,12 +11,9 @@ #include "../stdafx.h" #include "../debug.h" -#include "../string_func.h" #include "../fileio_func.h" -#include "../fios.h" #include "../network/network.h" #include "../core/random_func.hpp" -#include <sys/stat.h> #include <squirrel.h> #include "../script/squirrel.hpp"
--- a/src/ai/api/ai_abstractlist.cpp +++ b/src/ai/api/ai_abstractlist.cpp @@ -12,7 +12,6 @@ #include <squirrel.h> #include "ai_abstractlist.hpp" #include "../../debug.h" -#include "../../core/alloc_func.hpp" #include "../../script/squirrel.hpp" /**
--- a/src/ai/api/ai_airport.cpp +++ b/src/ai/api/ai_airport.cpp @@ -13,9 +13,7 @@ #include "ai_station.hpp" #include "../../station_base.h" #include "../../company_func.h" -#include "../../command_type.h" #include "../../town.h" -#include "../../economy_func.h" /* static */ bool AIAirport::IsValidAirportType(AirportType type) {
--- a/src/ai/api/ai_basestation.cpp +++ b/src/ai/api/ai_basestation.cpp @@ -10,13 +10,11 @@ /** @file ai_basestation.cpp Implementation of AIBaseStation. */ #include "ai_basestation.hpp" -#include "../../base_station_base.h" #include "../../station_base.h" #include "../../command_func.h" #include "../../string_func.h" #include "../../strings_func.h" #include "../../company_func.h" -#include "../../core/alloc_func.hpp" #include "table/strings.h" /* static */ bool AIBaseStation::IsValidBaseStation(StationID station_id)
--- a/src/ai/api/ai_bridge.cpp +++ b/src/ai/api/ai_bridge.cpp @@ -16,7 +16,6 @@ #include "../../strings_func.h" #include "../../core/alloc_func.hpp" #include "../../economy_func.h" -#include "../../settings_type.h" #include "../../date_func.h" /* static */ bool AIBridge::IsValidBridge(BridgeID bridge_id)
--- a/src/ai/api/ai_bridgelist.cpp +++ b/src/ai/api/ai_bridgelist.cpp @@ -12,7 +12,6 @@ #include "ai_bridgelist.hpp" #include "ai_bridge.hpp" #include "../../bridge.h" -#include "../../date_func.h" AIBridgeList::AIBridgeList() {
--- a/src/ai/api/ai_cargolist.cpp +++ b/src/ai/api/ai_cargolist.cpp @@ -12,7 +12,6 @@ #include "ai_cargolist.hpp" #include "ai_industry.hpp" #include "../../cargotype.h" -#include "../../tile_type.h" #include "../../industry.h" AICargoList::AICargoList()
--- a/src/ai/api/ai_company.cpp +++ b/src/ai/api/ai_company.cpp @@ -11,7 +11,6 @@ #include "ai_company.hpp" #include "ai_error.hpp" -#include "ai_log.hpp" #include "../../command_func.h" #include "../../company_func.h" #include "../../company_base.h" @@ -19,7 +18,6 @@ #include "../../economy_func.h" #include "../../strings_func.h" #include "../../tile_map.h" -#include "../../core/alloc_func.hpp" #include "../../string_func.h" #include "../../settings_func.h" #include "table/strings.h"
--- a/src/ai/api/ai_depotlist.cpp +++ b/src/ai/api/ai_depotlist.cpp @@ -10,7 +10,6 @@ /** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */ #include "ai_depotlist.hpp" -#include "../../tile_map.h" #include "../../company_func.h" #include "../../depot_base.h" #include "../../station_base.h"
--- a/src/ai/api/ai_event_types.cpp +++ b/src/ai/api/ai_event_types.cpp @@ -14,7 +14,6 @@ #include "../../command_type.h" #include "../../strings_func.h" #include "../../settings_type.h" -#include "../../rail.h" #include "../../engine_base.h" #include "../../articulated_vehicles.h" #include "table/strings.h"
--- a/src/ai/api/ai_group.cpp +++ b/src/ai/api/ai_group.cpp @@ -16,7 +16,6 @@ #include "../../group.h" #include "../../string_func.h" #include "../../strings_func.h" -#include "../../core/alloc_func.hpp" #include "../../command_func.h" #include "../../autoreplace_func.h" #include "../../settings_func.h"
--- a/src/ai/api/ai_industry.cpp +++ b/src/ai/api/ai_industry.cpp @@ -12,7 +12,6 @@ #include "ai_industry.hpp" #include "ai_cargo.hpp" #include "ai_map.hpp" -#include "../../tile_type.h" #include "../../industry.h" #include "../../strings_func.h" #include "../../station_base.h"
--- a/src/ai/api/ai_industrylist.cpp +++ b/src/ai/api/ai_industrylist.cpp @@ -10,7 +10,6 @@ /** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */ #include "ai_industrylist.hpp" -#include "../../tile_type.h" #include "../../industry.h" AIIndustryList::AIIndustryList()
--- a/src/ai/api/ai_industrytype.cpp +++ b/src/ai/api/ai_industrytype.cpp @@ -12,7 +12,6 @@ #include "ai_industrytype.hpp" #include "ai_map.hpp" #include "../../command_type.h" -#include "../../settings_type.h" #include "../../strings_func.h" #include "../../industry.h"
--- a/src/ai/api/ai_industrytypelist.cpp +++ b/src/ai/api/ai_industrytypelist.cpp @@ -10,7 +10,6 @@ /** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */ #include "ai_industrytypelist.hpp" -#include "../../tile_type.h" #include "../../industry.h" AIIndustryTypeList::AIIndustryTypeList()
--- a/src/ai/api/ai_object.cpp +++ b/src/ai/api/ai_object.cpp @@ -14,7 +14,6 @@ #include "../../script/squirrel.hpp" #include "../../company_base.h" -#include "ai_log.hpp" #include "table/strings.h" #include "../ai.hpp" #include "../ai_storage.hpp"
--- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -9,9 +9,7 @@ /** @file ai_order.cpp Implementation of AIOrder. */ -#include "ai_order.hpp" #include "ai_vehicle.hpp" -#include "ai_log.hpp" #include "../ai_instance.hpp" #include "../../debug.h" #include "../../vehicle_base.h"
--- a/src/ai/api/ai_road.cpp +++ b/src/ai/api/ai_road.cpp @@ -9,13 +9,11 @@ /** @file ai_road.cpp Implementation of AIRoad. */ -#include "ai_road.hpp" #include "ai_map.hpp" #include "ai_station.hpp" #include "ai_cargo.hpp" #include "../../station_base.h" #include "../../command_type.h" -#include "../../settings_type.h" #include "../../company_func.h" #include "../../script/squirrel_helper_type.hpp"
--- a/src/ai/api/ai_sign.cpp +++ b/src/ai/api/ai_sign.cpp @@ -10,7 +10,6 @@ /** @file ai_sign.cpp Implementation of AISign. */ #include "ai_sign.hpp" -#include "ai_log.hpp" #include "table/strings.h" #include "../ai_instance.hpp" #include "../../command_func.h"
--- a/src/ai/api/ai_station.cpp +++ b/src/ai/api/ai_station.cpp @@ -13,15 +13,11 @@ #include "ai_cargo.hpp" #include "ai_map.hpp" #include "ai_town.hpp" -#include "../../command_func.h" #include "../../debug.h" #include "../../station_base.h" #include "../../roadstop_base.h" -#include "../../string_func.h" -#include "../../strings_func.h" #include "../../company_func.h" #include "../../town.h" -#include "table/strings.h" /* static */ bool AIStation::IsValidStation(StationID station_id) {
--- a/src/ai/api/ai_subsidy.cpp +++ b/src/ai/api/ai_subsidy.cpp @@ -11,10 +11,8 @@ #include "ai_subsidy.hpp" #include "ai_date.hpp" -#include "ai_log.hpp" #include "../../subsidy_base.h" #include "../../station_base.h" -#include "../../cargotype.h" /* static */ bool AISubsidy::IsValidSubsidy(SubsidyID subsidy_id) {
--- a/src/ai/api/ai_subsidylist.cpp +++ b/src/ai/api/ai_subsidylist.cpp @@ -10,7 +10,6 @@ /** @file ai_subsidylist.cpp Implementation of AISubsidyList. */ #include "ai_subsidylist.hpp" -#include "ai_subsidy.hpp" #include "../../subsidy_base.h" AISubsidyList::AISubsidyList()
--- a/src/ai/api/ai_tile.cpp +++ b/src/ai/api/ai_tile.cpp @@ -12,7 +12,6 @@ #include "ai_tile.hpp" #include "ai_map.hpp" #include "ai_town.hpp" -#include "ai_log.hpp" #include "../../station_func.h" #include "../../company_func.h" #include "../../road_map.h"
--- a/src/ai/api/ai_tilelist.cpp +++ b/src/ai/api/ai_tilelist.cpp @@ -11,10 +11,8 @@ #include "ai_tilelist.hpp" #include "ai_industry.hpp" -#include "../../tile_map.h" #include "../../industry.h" #include "../../station_base.h" -#include "../../settings_type.h" void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2) {
--- a/src/ai/api/ai_town.cpp +++ b/src/ai/api/ai_town.cpp @@ -13,10 +13,8 @@ #include "ai_map.hpp" #include "ai_cargo.hpp" #include "ai_error.hpp" -#include "../../command_type.h" #include "../../town.h" #include "../../strings_func.h" -#include "../../core/alloc_func.hpp" #include "../../company_func.h" #include "../../station_base.h" #include "table/strings.h"
--- a/src/ai/api/ai_tunnel.cpp +++ b/src/ai/api/ai_tunnel.cpp @@ -14,8 +14,6 @@ #include "../ai_instance.hpp" #include "../../tunnel_map.h" #include "../../command_func.h" -#include "../../tunnelbridge.h" -#include "../../road_func.h" /* static */ bool AITunnel::IsTunnelTile(TileIndex tile) {
--- a/src/ai/api/ai_vehiclelist.cpp +++ b/src/ai/api/ai_vehiclelist.cpp @@ -13,9 +13,7 @@ #include "ai_group.hpp" #include "ai_map.hpp" #include "ai_station.hpp" -#include "ai_vehicle.hpp" #include "../../company_func.h" -#include "../../depot_base.h" #include "../../depot_map.h" #include "../../vehicle_base.h"
--- a/src/ai/api/ai_waypoint.cpp +++ b/src/ai/api/ai_waypoint.cpp @@ -11,13 +11,8 @@ #include "ai_waypoint.hpp" #include "ai_rail.hpp" -#include "../../command_func.h" -#include "../../string_func.h" -#include "../../strings_func.h" #include "../../company_func.h" #include "../../waypoint_base.h" -#include "../../core/alloc_func.hpp" -#include "table/strings.h" /* static */ bool AIWaypoint::IsValidWaypoint(StationID waypoint_id) {
--- a/src/ai/api/ai_waypointlist.cpp +++ b/src/ai/api/ai_waypointlist.cpp @@ -11,7 +11,6 @@ #include "ai_waypointlist.hpp" #include "ai_vehicle.hpp" -#include "ai_waypoint.hpp" #include "../../company_func.h" #include "../../vehicle_base.h" #include "../../waypoint_base.h"
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -26,7 +26,6 @@ #include "vehicle_func.h" #include "sound_func.h" #include "functions.h" -#include "variables.h" #include "cheat_type.h" #include "autoreplace_func.h" #include "autoreplace_gui.h" @@ -34,7 +33,6 @@ #include "ai/ai.hpp" #include "company_func.h" #include "effectvehicle_func.h" -#include "settings_type.h" #include "station_base.h" #include "cargotype.h" #include "newgrf_cargo.h"
--- a/src/airport.cpp +++ b/src/airport.cpp @@ -13,7 +13,6 @@ #include "debug.h" #include "airport.h" #include "airport_movement.h" -#include "core/bitmath_func.hpp" #include "core/alloc_func.hpp" #include "date_func.h" #include "settings_type.h"
--- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -17,11 +17,9 @@ #include "sound_func.h" #include "window_func.h" #include "strings_func.h" -#include "settings_type.h" #include "viewport_func.h" #include "gfx_func.h" #include "company_func.h" -#include "station_type.h" #include "tilehighlight_func.h" #include "company_base.h"
--- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -20,7 +20,6 @@ #include "functions.h" #include "autoreplace_func.h" #include "articulated_vehicles.h" -#include "core/alloc_func.hpp" #include "table/strings.h"
--- 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/alloc_func.hpp" #include "../core/math_func.hpp" #include "../gfx_func.h" #include "../video/video_driver.hpp"
--- a/src/blitter/32bpp_optimized.cpp +++ b/src/blitter/32bpp_optimized.cpp @@ -13,7 +13,6 @@ #include "../zoom_func.h" #include "../gfx_func.h" #include "../core/math_func.hpp" -#include "../core/alloc_func.hpp" #include "32bpp_optimized.hpp" static FBlitter_32bppOptimized iFBlitter_32bppOptimized;
--- a/src/blitter/8bpp_optimized.cpp +++ b/src/blitter/8bpp_optimized.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../zoom_func.h" -#include "../core/alloc_func.hpp" #include "../core/math_func.hpp" #include "8bpp_optimized.hpp"
--- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -18,7 +18,6 @@ #include "strings_func.h" #include "window_func.h" #include "sound_func.h" -#include "map_func.h" #include "gfx_func.h" #include "tunnelbridge.h" #include "sortlist_type.h"
--- a/src/bridge_map.cpp +++ b/src/bridge_map.cpp @@ -10,7 +10,6 @@ /** @file bridge_map.cpp Map accessor functions for bridges. */ #include "stdafx.h" -#include "bridge_map.h" #include "landscape.h" #include "tunnelbridge_map.h"
--- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -30,7 +30,6 @@ #include "widgets/dropdown_func.h" #include "window_gui.h" #include "engine_gui.h" -#include "settings_type.h" #include "cargotype.h" #include "newgrf_cargo.h"
--- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -19,7 +19,6 @@ #include "saveload/saveload.h" #include "window_gui.h" #include "newgrf.h" -#include "settings_type.h" #include "strings_func.h" #include "window_func.h" #include "rail_gui.h"
--- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -16,12 +16,11 @@ #include "landscape.h" #include "variables.h" #include "genworld.h" -#include "industry.h" +#include "landscape_type.h" #include "functions.h" #include "economy_func.h" #include "viewport_func.h" #include "water.h" -#include "settings_type.h" #include "table/strings.h" #include "table/sprites.h"
--- a/src/command.cpp +++ b/src/command.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "landscape.h" -#include "tile_map.h" #include "gui.h" #include "command_func.h" #include "network/network.h"
--- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -24,15 +24,12 @@ #include "company_manager_face.h" #include "group.h" #include "window_func.h" -#include "tile_map.h" #include "strings_func.h" #include "gfx_func.h" #include "date_func.h" #include "sound_func.h" #include "autoreplace_func.h" #include "autoreplace_gui.h" -#include "string_func.h" -#include "road_func.h" #include "rail.h" #include "sprite.h" #include "core/pool_func.hpp"
--- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -20,17 +20,15 @@ #include "network/network.h" #include "network/network_gui.h" #include "network/network_func.h" -#include "roadveh.h" -#include "train.h" -#include "aircraft.h" +#include "sprite.h" +#include "economy_func.h" +#include "vehicle_base.h" #include "newgrf.h" #include "company_manager_face.h" #include "strings_func.h" #include "date_func.h" -#include "string_func.h" #include "widgets/dropdown_type.h" #include "tilehighlight_func.h" -#include "settings_type.h" #include "table/strings.h"
--- a/src/console.cpp +++ b/src/console.cpp @@ -10,9 +10,6 @@ /** @file console.cpp Handling of the in-game console. */ #include "stdafx.h" -#include "core/alloc_func.hpp" -#include "core/math_func.hpp" -#include "string_func.h" #include "console_internal.h" #include "network/network.h" #include "network/network_func.h"
--- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -16,7 +16,6 @@ #include "engine_func.h" #include "landscape.h" #include "saveload/saveload.h" -#include "variables.h" #include "network/network.h" #include "network/network_func.h" #include "network/network_base.h" @@ -29,13 +28,10 @@ #include "strings_func.h" #include "viewport_func.h" #include "window_func.h" -#include "map_func.h" #include "date_func.h" #include "vehicle_func.h" -#include "string_func.h" #include "company_func.h" #include "company_base.h" -#include "settings_type.h" #include "gamelog.h" #include "ai/ai.hpp" #include "ai/ai_config.hpp"
--- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -17,11 +17,9 @@ #include "window_func.h" #include "string_func.h" #include "gfx_func.h" -#include "core/math_func.hpp" #include "settings_type.h" #include "rev.h" -#include "table/strings.h" enum { ICON_HISTORY_SIZE = 20,
--- a/src/core/alloc_func.cpp +++ b/src/core/alloc_func.cpp @@ -10,7 +10,6 @@ /** @file alloc_func.cpp Functions to 'handle' memory allocation errors */ #include "../stdafx.h" -#include "alloc_func.hpp" /** * Function to exit with an error message after malloc() or calloc() have failed
--- a/src/crashlog.cpp +++ b/src/crashlog.cpp @@ -14,7 +14,6 @@ #include "gamelog.h" #include "map_func.h" #include "rev.h" -#include "string_func.h" #include "strings_func.h" #include "blitter/factory.hpp" #include "base_media_base.h"
--- a/src/date.cpp +++ b/src/date.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "variables.h" -#include "settings_type.h" #include "network/network.h" #include "network/network_func.h" #include "currency.h"
--- a/src/depot.cpp +++ b/src/depot.cpp @@ -11,12 +11,8 @@ #include "stdafx.h" #include "depot_base.h" -#include "company_type.h" #include "order_func.h" #include "window_func.h" -#include "core/bitmath_func.hpp" -#include "tile_map.h" -#include "water_map.h" #include "core/pool_func.hpp" #include "vehicle_gui.h"
--- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "tile_map.h" -#include "station_type.h" #include "terraform_gui.h" #include "window_gui.h" #include "station_gui.h" @@ -27,7 +26,6 @@ #include "slope_func.h" #include "tilehighlight_func.h" #include "company_base.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/dummy_land.cpp +++ b/src/dummy_land.cpp @@ -13,7 +13,6 @@ #include "tile_cmd.h" #include "command_func.h" #include "viewport_func.h" -#include "tile_map.h" #include "table/strings.h" #include "table/sprites.h"
--- a/src/effectvehicle.cpp +++ b/src/effectvehicle.cpp @@ -11,11 +11,11 @@ #include "stdafx.h" #include "landscape.h" -#include "industry.h" +#include "core/random_func.hpp" +#include "industry_map.h" #include "vehicle_func.h" #include "sound_func.h" #include "animated_tile_func.h" -#include "effectvehicle_base.h" #include "effectvehicle_func.h" #include "table/sprites.h"
--- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -61,7 +61,6 @@ #include "train.h" #include "rail_gui.h" #include "tunnelbridge_map.h" -#include "vehicle_func.h" #include "tunnelbridge.h" #include "elrail_func.h" #include "engine_base.h"
--- a/src/engine.cpp +++ b/src/engine.cpp @@ -10,11 +10,9 @@ /** @file engine.cpp Base for all engine handling. */ #include "stdafx.h" -#include "debug.h" #include "company_func.h" #include "command_func.h" #include "news_func.h" -#include "variables.h" #include "aircraft.h" #include "newgrf.h" #include "newgrf_engine.h" @@ -27,8 +25,6 @@ #include "autoreplace_gui.h" #include "string_func.h" #include "ai/ai.hpp" -#include "vehicle_func.h" -#include "settings_type.h" #include "core/pool_func.hpp" #include "engine_gui.h"
--- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -15,18 +15,14 @@ #include "engine_func.h" #include "engine_base.h" #include "command_func.h" -#include "news_type.h" -#include "newgrf_engine.h" #include "strings_func.h" #include "engine_gui.h" #include "articulated_vehicles.h" #include "vehicle_func.h" #include "company_func.h" #include "rail.h" -#include "core/sort_func.hpp" #include "table/strings.h" -#include "table/sprites.h" /** Return the category of an engine. * @param engine Engine to examine.
--- a/src/fios.cpp +++ b/src/fios.cpp @@ -527,7 +527,6 @@ } #if defined(ENABLE_NETWORK) -#include "core/smallvec_type.hpp" #include "network/network_content.h" #include "3rdparty/md5/md5.h"
--- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -10,11 +10,9 @@ /** @file fontcache.cpp Cache for characters from fonts. */ #include "stdafx.h" -#include "spritecache.h" #include "fontcache.h" #include "blitter/factory.hpp" #include "gfx_func.h" -#include "core/alloc_func.hpp" #include "core/math_func.hpp" #include "table/sprites.h"
--- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -24,7 +24,6 @@ #include "viewport_func.h" #include "gfx_func.h" #include "date_func.h" -#include "core/random_func.hpp" #include "engine_func.h" #include "newgrf_storage.h" #include "water.h" @@ -32,7 +31,6 @@ #include "tilehighlight_func.h" #include "saveload/saveload.h" #include "void_map.h" -#include "settings_type.h" #include "town.h" #include "table/sprites.h"
--- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "heightmap.h" -#include "gui.h" #include "variables.h" #include "debug.h" #include "genworld.h" @@ -25,10 +24,8 @@ #include "fios.h" #include "string_func.h" #include "gfx_func.h" -#include "settings_type.h" #include "widgets/dropdown_type.h" #include "widgets/dropdown_func.h" -#include "core/random_func.hpp" #include "landscape_type.h" #include "querystring_gui.h" #include "town.h"
--- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -13,7 +13,6 @@ #include "openttd.h" #include "gfx_func.h" #include "variables.h" -#include "spritecache.h" #include "fontcache.h" #include "genworld.h" #include "zoom_func.h" @@ -21,11 +20,8 @@ #include "video/video_driver.hpp" #include "strings_func.h" #include "settings_type.h" -#include "core/alloc_func.hpp" -#include "core/sort_func.hpp" #include "landscape_type.h" #include "network/network_func.h" -#include "core/smallvec_type.hpp" #include "thread/thread.h" #include "window_func.h"
--- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -12,14 +12,12 @@ #include "stdafx.h" #include "debug.h" #include "spritecache.h" -#include "fileio_func.h" #include "fios.h" #include "newgrf.h" #include "3rdparty/md5/md5.h" #include "fontcache.h" #include "gfx_func.h" #include "settings_type.h" -#include "string_func.h" /* The type of set we're replacing */ #define SET_TYPE "graphics"
--- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -21,7 +21,6 @@ #include "autoreplace_func.h" #include "string_func.h" #include "company_func.h" -#include "core/alloc_func.hpp" #include "core/pool_func.hpp" #include "table/strings.h"
--- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -18,7 +18,6 @@ #include "bmp.h" #include "gfx_func.h" #include "fios.h" -#include "settings_type.h" #include "fileio_func.h" #include "table/strings.h"
--- a/src/highscore.cpp +++ b/src/highscore.cpp @@ -10,7 +10,6 @@ /** @file highscore.cpp Definition of functions used for highscore handling */ #include "highscore.h" -#include "settings_type.h" #include "company_base.h" #include "company_func.h" #include "cheat_func.h"
--- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -19,7 +19,6 @@ #include "command_func.h" #include "company_func.h" #include "company_base.h" -#include "settings_type.h" #include "strings_func.h" #include "openttd.h"
--- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "openttd.h" -#include "debug.h" #include "gui.h" #include "window_gui.h" #include "textbuf_gui.h" @@ -26,7 +25,6 @@ #include "newgrf_industries.h" #include "newgrf_text.h" #include "strings_func.h" -#include "map_func.h" #include "company_func.h" #include "tilehighlight_func.h" #include "string_func.h"
--- a/src/ini.cpp +++ b/src/ini.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "core/alloc_func.hpp" -#include "core/math_func.hpp" #include "core/mem_func.hpp" #include "debug.h" #include "ini_type.h"
--- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -15,7 +15,6 @@ #include "window_gui.h" #include "textbuf_gui.h" #include "network/network.h" -#include "variables.h" #include "genworld.h" #include "network/network_gui.h" #include "network/network_content.h" @@ -23,9 +22,7 @@ #include "strings_func.h" #include "window_func.h" #include "fios.h" -#include "settings_type.h" #include "functions.h" -#include "newgrf_config.h" #include "ai/ai_gui.hpp" #include "gfx_func.h"
--- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -28,7 +28,6 @@ #include "water.h" #include "effectvehicle_func.h" #include "landscape_type.h" -#include "settings_type.h" #include "animated_tile_func.h" #include "table/sprites.h"
--- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -19,7 +19,6 @@ #include "viewport_func.h" #include "command_func.h" #include "console_gui.h" -#include "map_func.h" #include "genworld.h" #include "transparency_gui.h" #include "functions.h" @@ -29,7 +28,6 @@ #include "zoom_func.h" #include "company_base.h" #include "company_func.h" -#include "settings_type.h" #include "toolbar_gui.h" #include "statusbar_gui.h" #include "tilehighlight_func.h"
--- a/src/map.cpp +++ b/src/map.cpp @@ -11,10 +11,8 @@ #include "stdafx.h" #include "debug.h" -#include "core/bitmath_func.hpp" #include "core/alloc_func.hpp" #include "core/math_func.hpp" -#include "map_func.h" #include "tile_map.h" #if defined(_MSC_VER)
--- a/src/misc.cpp +++ b/src/misc.cpp @@ -16,18 +16,13 @@ #include "variables.h" #include "ai/ai.hpp" #include "newgrf_house.h" -#include "cargotype.h" #include "group.h" #include "economy_func.h" -#include "functions.h" -#include "map_func.h" #include "date_func.h" -#include "vehicle_func.h" #include "texteff.hpp" #include "gfx_func.h" #include "gamelog.h" #include "animated_tile_func.h" -#include "settings_type.h" #include "tilehighlight_func.h" #include "network/network_func.h" #include "window_func.h"
--- a/src/misc_cmd.cpp +++ b/src/misc_cmd.cpp @@ -24,7 +24,6 @@ #include "string_func.h" #include "company_func.h" #include "company_gui.h" -#include "settings_type.h" #include "vehicle_base.h" #include "table/strings.h"
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -11,11 +11,9 @@ #include "stdafx.h" #include "openttd.h" -#include "debug.h" #include "landscape.h" #include "newgrf_text.h" #include "saveload/saveload.h" -#include "tile_map.h" #include "gui.h" #include "station_gui.h" #include "viewport_func.h" @@ -26,7 +24,6 @@ #include "town.h" #include "network/network.h" #include "network/network_content.h" -#include "variables.h" #include "company_base.h" #include "texteff.hpp" #include "cargotype.h" @@ -36,11 +33,9 @@ #include "fios.h" #include "zoom_func.h" #include "window_func.h" -#include "string_func.h" #include "newgrf_cargo.h" #include "tilehighlight_func.h" #include "querystring_gui.h" -#include "core/sort_func.hpp" #include "table/strings.h"
--- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -10,7 +10,6 @@ /** @file mixer.cpp Mixing of sound samples. */ #include "stdafx.h" -#include "mixer.h" #include "core/math_func.hpp" struct MixerChannel {
--- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -19,7 +19,6 @@ #include "window_func.h" #include "sound_func.h" #include "gfx_func.h" -#include "core/math_func.hpp" #include "core/random_func.hpp" #include "table/strings.h"
--- a/src/network/core/address.cpp +++ b/src/network/core/address.cpp @@ -14,9 +14,6 @@ #ifdef ENABLE_NETWORK #include "address.h" -#include "config.h" -#include "host.h" -#include "../../string_func.h" #include "../../debug.h" const char *NetworkAddress::GetHostname()
--- a/src/network/core/core.cpp +++ b/src/network/core/core.cpp @@ -15,8 +15,6 @@ #include "../../stdafx.h" #include "../../debug.h" -#include "os_abstraction.h" -#include "core.h" #include "packet.h"
--- a/src/network/core/host.cpp +++ b/src/network/core/host.cpp @@ -13,10 +13,7 @@ #include "../../stdafx.h" #include "../../debug.h" -#include "os_abstraction.h" #include "address.h" -#include "../../core/alloc_func.hpp" -#include "../../string_func.h" /** * Internal implementation for finding the broadcast IPs.
--- a/src/network/core/tcp.cpp +++ b/src/network/core/tcp.cpp @@ -16,7 +16,6 @@ #include "../../stdafx.h" #include "../../debug.h" -#include "packet.h" #include "tcp.h" NetworkTCPSocketHandler::NetworkTCPSocketHandler(SOCKET s) :
--- a/src/network/core/tcp_connect.cpp +++ b/src/network/core/tcp_connect.cpp @@ -14,8 +14,6 @@ #ifdef ENABLE_NETWORK #include "../../stdafx.h" -#include "../../debug.h" -#include "../../core/smallvec_type.hpp" #include "../../thread/thread.h" #include "tcp.h"
--- a/src/network/core/tcp_content.cpp +++ b/src/network/core/tcp_content.cpp @@ -14,7 +14,6 @@ #ifdef ENABLE_NETWORK #include "../../stdafx.h" -#include "../../debug.h" #include "tcp_content.h" ContentInfo::ContentInfo()
--- a/src/network/core/tcp_game.cpp +++ b/src/network/core/tcp_game.cpp @@ -15,11 +15,8 @@ #include "../../stdafx.h" #include "../../openttd.h" -#include "../../variables.h" #include "../network_internal.h" -#include "packet.h" -#include "tcp_game.h" #include "../../core/pool_func.hpp" #include "table/strings.h"
--- a/src/network/core/udp.cpp +++ b/src/network/core/udp.cpp @@ -14,12 +14,7 @@ #ifdef ENABLE_NETWORK #include "../../stdafx.h" -#include "../../debug.h" -#include "../../core/bitmath_func.hpp" -#include "../../core/math_func.hpp" -#include "../../core/alloc_func.hpp" #include "../../date_func.h" -#include "packet.h" #include "udp.h" /**
--- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -10,14 +10,12 @@ /** @file network.cpp Base functions for networking support. */ #include "../stdafx.h" -#include "../company_type.h" #ifdef ENABLE_NETWORK #include "../openttd.h" #include "../strings_func.h" #include "../command_func.h" -#include "../variables.h" #include "../date_func.h" #include "network_internal.h" #include "network_client.h" @@ -32,13 +30,10 @@ #include "../3rdparty/md5/md5.h" #include "../core/random_func.hpp" #include "../window_func.h" -#include "../string_func.h" #include "../company_func.h" #include "../company_base.h" -#include "../settings_type.h" #include "../landscape_type.h" #include "../rev.h" -#include "../core/alloc_func.hpp" #include "../core/pool_func.hpp" #ifdef DEBUG_DUMP_COMMANDS #include "../fileio_func.h"
--- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -14,7 +14,6 @@ #include "../stdafx.h" #include "../debug.h" #include "../openttd.h" -#include "../gfx_func.h" #include "network_internal.h" #include "network_gui.h" #include "../saveload/saveload.h" @@ -24,11 +23,9 @@ #include "../3rdparty/md5/md5.h" #include "../strings_func.h" #include "../window_func.h" -#include "../string_func.h" #include "../company_func.h" #include "../company_base.h" #include "../company_gui.h" -#include "../settings_type.h" #include "../rev.h" #include "table/strings.h"
--- a/src/network/network_command.cpp +++ b/src/network/network_command.cpp @@ -17,8 +17,6 @@ #include "network_client.h" #include "../command_func.h" #include "../callback_table.h" -#include "../core/alloc_func.hpp" -#include "../string_func.h" #include "../company_func.h" /** Local queue of packets */
--- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -13,8 +13,6 @@ #include "../stdafx.h" #include "../rev.h" -#include "../fileio_func.h" -#include "../string_func.h" #include "../ai/ai.hpp" #include "../window_func.h" #include "../gui.h"
--- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -11,11 +11,9 @@ #if defined(ENABLE_NETWORK) #include "../stdafx.h" -#include "../string_func.h" #include "../strings_func.h" #include "../gfx_func.h" #include "../window_func.h" -#include "../window_gui.h" #include "../gui.h" #include "../ai/ai.hpp" #include "../base_media_base.h"
--- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -16,9 +16,7 @@ #include "../stdafx.h" #include "../debug.h" -#include "../core/alloc_func.hpp" #include "../thread/thread.h" -#include "../string_func.h" #include "network_internal.h" #include "network_udp.h" #include "network_gamelist.h"
--- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -20,18 +20,14 @@ #include "network_gui.h" #include "network_gamelist.h" #include "../gui.h" -#include "network_server.h" #include "network_udp.h" #include "../window_func.h" -#include "../string_func.h" #include "../gfx_func.h" -#include "../settings_type.h" #include "../widgets/dropdown_func.h" #include "../querystring_gui.h" #include "../sortlist_type.h" #include "../company_base.h" #include "../company_func.h" -#include "../core/sort_func.hpp" #include "table/strings.h" #include "../table/sprites.h"
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -25,10 +25,8 @@ #include "../station_base.h" #include "../genworld.h" #include "../fileio_func.h" -#include "../string_func.h" #include "../company_func.h" #include "../company_gui.h" -#include "../settings_type.h" #include "../window_func.h" #include "../openttd.h"
--- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -22,12 +22,8 @@ #include "network_gamelist.h" #include "network_internal.h" #include "network_udp.h" -#include "core/host.h" #include "../core/endian_func.hpp" -#include "../core/alloc_func.hpp" -#include "../string_func.h" #include "../company_base.h" -#include "../settings_type.h" #include "../thread/thread.h" #include "../rev.h"
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -41,11 +41,8 @@ #include "strings_func.h" #include "gfx_func.h" #include "date_func.h" -#include "vehicle_func.h" -#include "sound_func.h" #include "string_func.h" #include "network/network.h" -#include "map_func.h" #include <map> #include "core/alloc_type.hpp" #include "core/mem_func.hpp"
--- a/src/newgrf_canal.cpp +++ b/src/newgrf_canal.cpp @@ -10,7 +10,6 @@ /** @file newgrf_canal.cpp Implementation of NewGRF canals. */ #include "stdafx.h" -#include "core/overflowsafe_type.hpp" #include "tile_type.h" #include "debug.h" #include "newgrf_commons.h"
--- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -13,7 +13,6 @@ #include "debug.h" #include "newgrf.h" #include "newgrf_spritegroup.h" -#include "newgrf_cargo.h" static uint32 CargoGetRandomBits(const ResolverObject *object) {
--- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -13,8 +13,8 @@ #include "stdafx.h" #include "landscape.h" -#include "town.h" -#include "industry.h" +#include "house.h" +#include "industrytype.h" #include "newgrf.h" #include "newgrf_commons.h" #include "station_map.h"
--- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -10,13 +10,10 @@ /** @file newgrf_config.cpp Finding NewGRFs and configuring them. */ #include "stdafx.h" -#include "core/sort_func.hpp" #include "debug.h" #include "3rdparty/md5/md5.h" #include "newgrf.h" -#include "string_func.h" #include "gamelog.h" -#include "network/network_type.h" #include "network/network_func.h" #include "gfx_func.h"
--- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -22,7 +22,6 @@ #include "core/random_func.hpp" #include "aircraft.h" #include "core/smallmap_type.hpp" -#include "settings_type.h" #include "station_base.h" struct WagonOverride {
--- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -11,12 +11,9 @@ #include "stdafx.h" #include "gui.h" -#include "window_gui.h" -#include "textbuf_gui.h" #include "newgrf.h" #include "strings_func.h" #include "window_func.h" -#include "string_func.h" #include "gfx_func.h" #include "gamelog.h" #include "settings_func.h"
--- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -15,7 +15,6 @@ #include "debug.h" #include "viewport_func.h" #include "landscape.h" -#include "town_map.h" #include "sprite.h" #include "newgrf.h" #include "newgrf_house.h"
--- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -11,9 +11,7 @@ #include "stdafx.h" #include "debug.h" -#include "tile_type.h" #include "strings_type.h" -#include "company_type.h" #include "industry.h" #include "newgrf.h" #include "newgrf_industries.h"
--- a/src/newgrf_sound.cpp +++ b/src/newgrf_sound.cpp @@ -16,7 +16,6 @@ #include "newgrf_sound.h" #include "vehicle_base.h" #include "sound_func.h" -#include "core/smallvec_type.hpp" #include "core/mem_func.hpp" static SmallVector<SoundEntry, ORIGINAL_SAMPLE_COUNT> _sounds;
--- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -15,8 +15,7 @@ #include "window_gui.h" #include "viewport_func.h" #include "news_type.h" -#include "settings_type.h" -#include "transparency.h" +#include "gfx_func.h" #include "strings_func.h" #include "window_func.h" #include "date_func.h" @@ -31,7 +30,6 @@ #include "statusbar_gui.h" #include "company_manager_face.h" #include "company_func.h" -#include "map_func.h" #include "engine_gui.h" #include "table/strings.h"
--- a/src/npf.cpp +++ b/src/npf.cpp @@ -14,14 +14,11 @@ #include "debug.h" #include "landscape.h" #include "depot_base.h" -#include "depot_map.h" #include "network/network.h" #include "tunnelbridge_map.h" #include "functions.h" -#include "vehicle_base.h" #include "tunnelbridge.h" #include "pbs.h" -#include "settings_type.h" #include "pathfind.h" #include "train.h"
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -23,7 +23,6 @@ #include "video/video_driver.hpp" #include "fontcache.h" -#include "gfxinit.h" #include "gui.h" #include "sound_func.h" #include "window_func.h" @@ -34,7 +33,6 @@ #include "company_func.h" #include "command_func.h" #include "news_func.h" -#include "fileio_func.h" #include "fios.h" #include "aircraft.h" #include "roadveh.h" @@ -61,7 +59,8 @@ #include "rev.h" #include "highscore.h" #include "thread/thread.h" -#include "station_base.h" +#include "base_station_base.h" +#include "airport.h" #include "crashlog.h" #include "newgrf_commons.h"
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -16,8 +16,6 @@ #include "news_func.h" #include "vehicle_gui.h" #include "cargotype.h" -#include "station_map.h" -#include "vehicle_base.h" #include "strings_func.h" #include "functions.h" #include "window_func.h" @@ -25,7 +23,6 @@ #include "timetable.h" #include "vehicle_func.h" #include "depot_base.h" -#include "settings_type.h" #include "roadstop_base.h" #include "core/pool_func.hpp" #include "aircraft.h"
--- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -10,7 +10,6 @@ /** @file order_gui.cpp GUI related to orders. */ #include "stdafx.h" -#include "station_map.h" #include "window_gui.h" #include "command_func.h" #include "viewport_func.h" @@ -30,7 +29,6 @@ #include "string_func.h" #include "tilehighlight_func.h" #include "network/network.h" -#include "settings_type.h" #include "station_base.h" #include "waypoint_base.h"
--- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -10,14 +10,10 @@ /** @file unix.cpp Implementation of Unix specific file handling. */ #include "../../stdafx.h" -#include "../../openttd.h" -#include "../../variables.h" #include "../../textbuf_gui.h" #include "../../functions.h" -#include "../../core/random_func.hpp" #include "../../crashlog.h" -#include "table/strings.h" #include <dirent.h> #include <unistd.h>
--- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -10,7 +10,6 @@ /** @file osk_gui.cpp The On Screen Keyboard GUI */ #include "stdafx.h" -#include "core/math_func.hpp" #include "string_func.h" #include "strings_func.h" #include "debug.h"
--- a/src/pathfind.cpp +++ b/src/pathfind.cpp @@ -10,7 +10,6 @@ /** @file pathfind.cpp Implementation of the oldest supported pathfinder. */ #include "stdafx.h" -#include "settings_type.h" #include "pathfind.h" #include "debug.h" #include "tunnelbridge_map.h"
--- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -9,7 +9,6 @@ /** @file pbs.cpp */ #include "stdafx.h" -#include "pbs.h" #include "functions.h" #include "vehicle_func.h" #include "yapf/follow_track.hpp"
--- a/src/rail.cpp +++ b/src/rail.cpp @@ -16,7 +16,6 @@ #include "company_func.h" #include "company_base.h" #include "engine_base.h" -#include "settings_type.h" /* XXX: Below 3 tables store duplicate data. Maybe remove some? */ /* Maps a trackdir to the bit that stores its status in the map arrays, in the
--- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -13,14 +13,13 @@ #include "openttd.h" #include "cmd_helper.h" #include "landscape.h" -#include "town_map.h" #include "viewport_func.h" #include "command_func.h" #include "engine_base.h" #include "depot_base.h" #include "yapf/yapf.h" #include "newgrf_engine.h" -#include "newgrf_station.h" +#include "landscape_type.h" #include "newgrf_commons.h" #include "train.h" #include "variables.h" @@ -31,7 +30,6 @@ #include "vehicle_func.h" #include "sound_func.h" #include "tunnelbridge.h" -#include "station_map.h" #include "functions.h" #include "elrail_func.h" #include "town.h"
--- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -29,7 +29,6 @@ #include "widgets/dropdown_type.h" #include "tunnelbridge.h" #include "tilehighlight_func.h" -#include "settings_type.h" #include "spritecache.h" #include "station_map.h"
--- a/src/road.cpp +++ b/src/road.cpp @@ -19,7 +19,6 @@ #include "company_base.h" #include "engine_base.h" #include "date_func.h" -#include "settings_type.h" #include "landscape.h" bool IsPossibleCrossing(const TileIndex tile, Axis ax)
--- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -14,13 +14,11 @@ #include "cmd_helper.h" #include "road_internal.h" #include "landscape.h" -#include "town_map.h" #include "viewport_func.h" #include "command_func.h" #include "yapf/yapf.h" #include "depot_base.h" #include "newgrf.h" -#include "station_map.h" #include "variables.h" #include "autoslope.h" #include "tunnelbridge_map.h"
--- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -30,7 +30,6 @@ #include "tunnelbridge.h" #include "tilehighlight_func.h" #include "company_base.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/roadstop.cpp +++ b/src/roadstop.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "roadveh.h" -#include "station_map.h" #include "core/pool_func.hpp" #include "roadstop_base.h" #include "station_base.h"
--- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "landscape.h" #include "roadveh.h" -#include "station_base.h" #include "command_func.h" #include "news_func.h" #include "pathfind.h" @@ -30,13 +29,11 @@ #include "date_func.h" #include "vehicle_func.h" #include "sound_func.h" -#include "variables.h" #include "autoreplace_gui.h" #include "gfx_func.h" #include "ai/ai.hpp" -#include "depot_base.h" +#include "depot_map.h" #include "effectvehicle_func.h" -#include "settings_type.h" #include "roadstop_base.h" #include "cargotype.h" #include "newgrf_cargo.h"
--- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -16,15 +16,12 @@ #include "../depot_base.h" #include "../window_func.h" #include "../fios.h" -#include "../train.h" -#include "../string_func.h" #include "../gamelog.h" #include "../gamelog_internal.h" #include "../network/network.h" #include "../gfxinit.h" #include "../functions.h" #include "../industry.h" -#include "../town_map.h" #include "../clear_map.h" #include "../vehicle_func.h" #include "../newgrf_station.h"
--- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../company_base.h" -#include "../company_func.h" #include "../debug.h" #include "saveload.h" #include "../string_func.h"
--- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -13,7 +13,6 @@ #include "../company_base.h" #include "../company_func.h" #include "../company_manager_face.h" -#include "../settings_type.h" #include "saveload.h"
--- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -10,9 +10,7 @@ /** @file industry_sl.cpp Code handling saving and loading of industries */ #include "../stdafx.h" -#include "../tile_type.h" #include "../strings_type.h" -#include "../company_type.h" #include "../industry.h" #include "../newgrf_commons.h"
--- a/src/saveload/labelmaps_sl.cpp +++ b/src/saveload/labelmaps_sl.cpp @@ -10,17 +10,8 @@ /** @file labelmaps_sl.cpp Code handling saving and loading of rail type label mappings */ #include "../stdafx.h" -#include "../strings_type.h" -#include "../rail.h" -#include "../map_func.h" -#include "../tile_map.h" -#include "../rail_map.h" -#include "../road_map.h" #include "../station_map.h" #include "../tunnelbridge_map.h" -#include "../core/alloc_func.hpp" -#include "../core/smallvec_type.hpp" -#include "../settings_type.h" #include "saveload.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 "../variables.h" -#include "../core/random_func.hpp" #include "../openttd.h" #include "../zoom_func.h" #include "../vehicle_func.h"
--- a/src/saveload/oldloader.cpp +++ b/src/saveload/oldloader.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../openttd.h" -#include "../tile_type.h" #include "../debug.h" #include "../strings_type.h" #include "../string_func.h"
--- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -22,7 +22,6 @@ #include "../subsidy_base.h" #include "../debug.h" #include "../depot_base.h" -#include "../newgrf_config.h" #include "../zoom_func.h" #include "../date_func.h" #include "../vehicle_func.h"
--- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -31,7 +31,6 @@ #include "../window_func.h" #include "../strings_func.h" #include "../gfx_func.h" -#include "../core/alloc_func.hpp" #include "../core/endian_func.hpp" #include "../vehicle_base.h" #include "../company_func.h"
--- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -13,11 +13,7 @@ #include "../station_base.h" #include "../waypoint_base.h" #include "../roadstop_base.h" -#include "../order_base.h" #include "../vehicle_base.h" -#include "../core/bitmath_func.hpp" -#include "../core/alloc_func.hpp" -#include "../variables.h" #include "../newgrf_station.h" #include "saveload.h"
--- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../newgrf_house.h" #include "../newgrf_commons.h" -#include "../variables.h" #include "../town.h" #include "saveload.h"
--- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -14,11 +14,9 @@ #include "../newgrf_station.h" #include "../vehicle_base.h" #include "../town.h" -#include "../station_map.h" #include "table/strings.h" -#include "saveload.h" #include "saveload_internal.h" /** Helper structure to convert from the old waypoint system. */
--- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -15,10 +15,8 @@ #include "viewport_func.h" #include "gfx_func.h" #include "screenshot.h" -#include "variables.h" #include "blitter/factory.hpp" #include "zoom_func.h" -#include "core/alloc_func.hpp" #include "core/endian_func.hpp" #include "map_func.h" #include "saveload/saveload.h"
--- a/src/script/script_scanner.cpp +++ b/src/script/script_scanner.cpp @@ -16,7 +16,6 @@ #include <squirrel.h> #include "../script/squirrel.hpp" -#include "script_info.hpp" #include "script_scanner.hpp" void ScriptScanner::ScanDir(const char *dirname, const char *info_file_name)
--- a/src/sdl.cpp +++ b/src/sdl.cpp @@ -13,7 +13,6 @@ #ifdef WITH_SDL -#include "openttd.h" #include "sdl.h" #include <SDL.h>
--- a/src/settings.cpp +++ b/src/settings.cpp @@ -57,14 +57,11 @@ #include "blitter/factory.hpp" #include "base_media_base.h" #include "gamelog.h" -#include "station_func.h" -#include "map_type.h" #include "settings_func.h" #include "ini_type.h" #include "ai/ai.hpp" #include "ai/ai_config.hpp" #include "newgrf.h" -#include "engine_base.h" #include "ship.h" #include "void_map.h"
--- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -16,11 +16,9 @@ #include "window_gui.h" #include "textbuf_gui.h" #include "command_func.h" -#include "engine_func.h" #include "screenshot.h" #include "network/network.h" #include "town.h" -#include "variables.h" #include "settings_internal.h" #include "newgrf_townname.h" #include "strings_func.h"
--- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -14,7 +14,6 @@ #include "landscape.h" #include "timetable.h" #include "command_func.h" -#include "station_base.h" #include "news_func.h" #include "company_func.h" #include "npf.h" @@ -30,11 +29,9 @@ #include "date_func.h" #include "vehicle_func.h" #include "sound_func.h" -#include "variables.h" #include "autoreplace_gui.h" #include "gfx_func.h" #include "effectvehicle_func.h" -#include "settings_type.h" #include "ai/ai.hpp" #include "pathfind.h" #include "landscape_type.h"
--- a/src/signs.cpp +++ b/src/signs.cpp @@ -14,9 +14,6 @@ #include "signs_base.h" #include "signs_func.h" #include "strings_func.h" -#include "viewport_func.h" -#include "zoom_func.h" -#include "functions.h" #include "core/pool_func.hpp" #include "table/strings.h"
--- a/src/signs_cmd.cpp +++ b/src/signs_cmd.cpp @@ -17,7 +17,6 @@ #include "command_func.h" #include "tilehighlight_func.h" #include "window_func.h" -#include "map_func.h" #include "string_func.h" #include "table/strings.h"
--- a/src/sound.cpp +++ b/src/sound.cpp @@ -12,11 +12,9 @@ #include "stdafx.h" #include "landscape.h" #include "mixer.h" -#include "fileio_func.h" #include "newgrf_sound.h" #include "fios.h" #include "window_gui.h" -#include "map_func.h" #include "vehicle_base.h" #include "debug.h"
--- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -13,7 +13,6 @@ #include "gfx_type.h" #include "fileio_func.h" #include "spriteloader/grf.hpp" -#include "core/alloc_func.hpp" #include "gfx_func.h" #ifdef WITH_PNG #include "spriteloader/png.hpp"
--- a/src/spriteloader/grf.cpp +++ b/src/spriteloader/grf.cpp @@ -13,7 +13,6 @@ #include "../gfx_func.h" #include "../fileio_func.h" #include "../debug.h" -#include "../core/alloc_func.hpp" #include "../strings_func.h" #include "table/strings.h" #include "../gui.h"
--- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -15,7 +15,6 @@ #include "../gfx_func.h" #include "../fileio_func.h" #include "../debug.h" -#include "../core/alloc_func.hpp" #include "png.hpp" #include <png.h>
--- a/src/station.cpp +++ b/src/station.cpp @@ -12,12 +12,8 @@ #include "stdafx.h" #include "company_func.h" #include "newgrf_cargo.h" -#include "yapf/yapf.h" #include "cargotype.h" #include "roadveh.h" -#include "window_type.h" -#include "station_gui.h" -#include "zoom_func.h" #include "functions.h" #include "window_func.h" #include "date_func.h" @@ -25,8 +21,6 @@ #include "news_func.h" #include "aircraft.h" #include "vehicle_gui.h" -#include "settings_type.h" -#include "subsidy_func.h" #include "core/pool_func.hpp" #include "station_base.h" #include "roadstop_base.h"
--- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -29,10 +29,8 @@ #include "station_base.h" #include "waypoint_base.h" #include "tilehighlight_func.h" -#include "core/smallmap_type.hpp" #include "company_base.h" #include "sortlist_type.h" -#include "settings_type.h" #include "table/strings.h" #include "table/sprites.h"
--- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" #include "openttd.h" -#include "settings_type.h" #include "date_func.h" #include "gfx_func.h" #include "news_func.h"
--- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -17,14 +17,10 @@ #include "strgen.h" #include "../table/control_codes.h" -#include <stdio.h> -#include <string.h> -#include <stdlib.h> #include <stdarg.h> #if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__) #include <unistd.h> -#include <sys/types.h> #include <sys/stat.h> #endif
--- a/src/strings.cpp +++ b/src/strings.cpp @@ -12,8 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "currency.h" -#include "spritecache.h" -#include "townname_func.h" #include "station_base.h" #include "town.h" #include "screenshot.h" @@ -23,7 +21,6 @@ #include "music.h" #include "fileio_func.h" #include "group.h" -#include "newgrf_townname.h" #include "signs_base.h" #include "cargotype.h" #include "fontcache.h" @@ -33,7 +30,6 @@ #include "core/endian_func.hpp" #include "date_func.h" #include "vehicle_base.h" -#include "company_func.h" #include "video/video_driver.hpp" #include "engine_base.h" #include "strgen/strgen.h"
--- a/src/subsidy.cpp +++ b/src/subsidy.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "company_func.h" #include "industry.h" -#include "map_func.h" #include "town.h" #include "news_func.h" #include "ai/ai.hpp"
--- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -10,11 +10,9 @@ /** @file subsidy_gui.cpp GUI for subsidies. */ #include "stdafx.h" -#include "station_base.h" +#include "strings_type.h" #include "industry.h" #include "town.h" -#include "economy_func.h" -#include "cargotype.h" #include "window_gui.h" #include "strings_func.h" #include "date_func.h"
--- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -17,7 +17,6 @@ #include "variables.h" #include "functions.h" #include "economy_func.h" -#include "settings_type.h" #include "table/strings.h"
--- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -29,10 +29,8 @@ #include "textbuf_gui.h" #include "genworld.h" #include "tree_map.h" -#include "station_map.h" #include "landscape_type.h" #include "tilehighlight_func.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/texteff.cpp +++ b/src/texteff.cpp @@ -17,7 +17,6 @@ #include "transparency.h" #include "strings_func.h" #include "core/alloc_func.hpp" -#include "functions.h" #include "viewport_func.h" #include "settings_type.h"
--- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -17,7 +17,6 @@ #include "core/alloc_func.hpp" #include "core/random_func.hpp" #include "landscape_type.h" -#include "settings_type.h" /* *
--- a/src/tile_map.cpp +++ b/src/tile_map.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "tile_map.h" #include "core/math_func.hpp" -#include "settings_type.h" /** * Return the slope of a given tile
--- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -14,7 +14,6 @@ #include "functions.h" #include "window_func.h" #include "vehicle_base.h" -#include "settings_type.h" #include "table/strings.h"
--- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -20,7 +20,6 @@ #include "string_func.h" #include "gfx_func.h" #include "company_func.h" -#include "settings_type.h" #include "table/strings.h"
--- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -41,8 +41,6 @@ #include "tilehighlight_func.h" #include "rail.h" #include "widgets/dropdown_type.h" -#include "settings_type.h" -#include "newgrf_config.h" #include "network/network.h" #include "network/network_gui.h"
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -15,7 +15,6 @@ #include "road_internal.h" /* Cleaning up road bits */ #include "road_cmd.h" #include "landscape.h" -#include "town_map.h" #include "viewport_func.h" #include "command_func.h" #include "industry.h" @@ -24,14 +23,11 @@ #include "news_func.h" #include "gui.h" #include "unmovable_map.h" -#include "water_map.h" #include "variables.h" -#include "slope_func.h" #include "genworld.h" #include "newgrf.h" #include "newgrf_house.h" #include "newgrf_commons.h" -#include "newgrf_townname.h" #include "newgrf_text.h" #include "autoslope.h" #include "transparency.h" @@ -40,8 +36,6 @@ #include "window_func.h" #include "string_func.h" #include "newgrf_cargo.h" -#include "economy_func.h" -#include "station_func.h" #include "cheat_type.h" #include "functions.h" #include "animated_tile_func.h"
--- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -13,11 +13,8 @@ #include "openttd.h" #include "town.h" #include "viewport_func.h" -#include "window_func.h" #include "gfx_func.h" #include "gui.h" -#include "window_gui.h" -#include "textbuf_gui.h" #include "command_func.h" #include "company_func.h" #include "company_base.h" @@ -30,13 +27,10 @@ #include "tilehighlight_func.h" #include "sortlist_type.h" #include "road_cmd.h" -#include "landscape_type.h" #include "landscape.h" #include "cargotype.h" -#include "tile_map.h" #include "querystring_gui.h" #include "window_func.h" -#include "string_func.h" #include "townname_func.h" #include "townname_type.h"
--- a/src/townname.cpp +++ b/src/townname.cpp @@ -10,9 +10,7 @@ /** @file townname.cpp Town name generators. */ #include "stdafx.h" -#include "townname_func.h" #include "string_func.h" -#include "townname_func.h" #include "townname_type.h" #include "town.h" #include "core/alloc_func.hpp"
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -15,12 +15,8 @@ #include "command_func.h" #include "npf.h" #include "news_func.h" -#include "engine_func.h" -#include "engine_base.h" #include "company_func.h" -#include "depot_base.h" #include "vehicle_gui.h" -#include "train.h" #include "newgrf_engine.h" #include "newgrf_sound.h" #include "newgrf_text.h" @@ -32,7 +28,6 @@ #include "window_func.h" #include "vehicle_func.h" #include "sound_func.h" -#include "variables.h" #include "autoreplace_gui.h" #include "gfx_func.h" #include "ai/ai.hpp"
--- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -15,12 +15,10 @@ #include "command_func.h" #include "vehicle_gui.h" #include "train.h" -#include "newgrf_engine.h" #include "strings_func.h" #include "vehicle_func.h" #include "engine_base.h" #include "window_func.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -14,7 +14,6 @@ #include "window_gui.h" #include "transparency.h" #include "sound_func.h" -#include "core/math_func.hpp" #include "table/sprites.h" #include "table/strings.h"
--- a/src/tree_gui.cpp +++ b/src/tree_gui.cpp @@ -18,7 +18,6 @@ #include "company_base.h" #include "command_func.h" #include "sound_func.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -35,7 +35,6 @@ #include "vehicle_func.h" #include "sound_func.h" #include "tunnelbridge.h" -#include "engine_base.h" #include "cheat_type.h" #include "elrail_func.h" #include "landscape_type.h"
--- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -18,7 +18,6 @@ #include "town.h" #include "sprite.h" #include "bridge_map.h" -#include "unmovable_map.h" #include "genworld.h" #include "autoslope.h" #include "transparency.h" @@ -26,7 +25,6 @@ #include "window_func.h" #include "vehicle_func.h" #include "company_gui.h" -#include "economy_func.h" #include "cheat_type.h" #include "landscape_type.h" #include "unmovable.h"
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -42,7 +42,6 @@ #include "ai/ai.hpp" #include "core/smallmap_type.hpp" #include "depot_func.h" -#include "settings_type.h" #include "network/network.h" #include "core/pool_func.hpp" #include "economy_base.h"
--- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -37,7 +37,6 @@ #include "widgets/dropdown_func.h" #include "timetable.h" #include "vehiclelist.h" -#include "settings_type.h" #include "articulated_vehicles.h" #include "cargotype.h"
--- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -43,7 +43,6 @@ #include "zoom_func.h" #include "vehicle_func.h" #include "company_func.h" -#include "station_func.h" #include "waypoint_func.h" #include "window_func.h" #include "tilehighlight_func.h"
--- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -23,7 +23,7 @@ #include "train.h" #include "roadveh.h" #include "water.h" -#include "industry.h" +#include "industry_map.h" #include "cargotype.h" #include "newgrf_canal.h" #include "transparency.h"
--- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -11,7 +11,6 @@ #include "stdafx.h" -#include "strings_type.h" #include "order_func.h" #include "window_func.h" #include "newgrf_station.h"
--- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -13,13 +13,11 @@ #include "command_func.h" #include "landscape.h" -#include "economy_func.h" #include "bridge_map.h" #include "town.h" #include "waypoint_base.h" #include "yapf/yapf.h" #include "strings_func.h" -#include "gfx_func.h" #include "functions.h" #include "window_func.h" #include "date_func.h" @@ -27,8 +25,7 @@ #include "string_func.h" #include "company_func.h" #include "newgrf_station.h" -#include "viewport_func.h" -#include "train.h" +#include "company_base.h" #include "water.h" #include "table/strings.h"
--- a/src/widget.cpp +++ b/src/widget.cpp @@ -12,7 +12,6 @@ #include "stdafx.h" #include "openttd.h" #include "company_func.h" -#include "gfx_func.h" #include "window_gui.h" #include "viewport_func.h" #include "zoom_func.h"
--- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -14,7 +14,6 @@ #include "../strings_func.h" #include "../gfx_func.h" #include "../window_func.h" -#include "../core/math_func.hpp" #include "dropdown_type.h" #include "table/strings.h"
--- a/src/window.cpp +++ b/src/window.cpp @@ -23,7 +23,6 @@ #include "zoom_func.h" #include "map_func.h" #include "vehicle_base.h" -#include "settings_type.h" #include "cheat_type.h" #include "window_func.h" #include "tilehighlight_func.h"