From 6d6be50ae0b0a0b233f918c3d7b9c0b623676439 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 3 Jan 2012 21:32:51 +0000 Subject: (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files --- src/script/api/script_admin.cpp | 1 - src/script/api/script_bridge.cpp | 1 - src/script/api/script_cargo.cpp | 1 - src/script/api/script_company.cpp | 1 - src/script/api/script_companymode.cpp | 4 ---- src/script/api/script_controller.cpp | 1 - src/script/api/script_engine.cpp | 1 - src/script/api/script_enginelist.cpp | 1 - src/script/api/script_event_types.cpp | 1 - src/script/api/script_execmode.cpp | 2 -- src/script/api/script_game.cpp | 1 - src/script/api/script_goal.cpp | 4 ---- src/script/api/script_group.cpp | 2 -- src/script/api/script_grouplist.cpp | 1 - src/script/api/script_infrastructure.cpp | 1 - src/script/api/script_news.cpp | 3 --- src/script/api/script_object.cpp | 3 --- src/script/api/script_order.cpp | 1 - src/script/api/script_rail.cpp | 1 - src/script/api/script_sign.cpp | 2 -- src/script/api/script_station.cpp | 2 -- src/script/api/script_testmode.cpp | 2 -- src/script/api/script_text.cpp | 1 - src/script/api/script_tile.cpp | 3 --- src/script/api/script_town.cpp | 2 -- src/script/api/script_tunnel.cpp | 2 -- src/script/script_config.cpp | 1 - src/script/script_info_dummy.cpp | 1 - src/script/script_instance.cpp | 2 -- src/script/script_scanner.cpp | 2 -- 30 files changed, 51 deletions(-) (limited to 'src/script') diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp index c3845b897..3625fb458 100644 --- 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) { diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp index 57e414dbd..748489655 100644 --- 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) diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp index 6a0a2b944..e8268b6bb 100644 --- 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" diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp index d4bc5d3e7..571cc80c6 100644 --- 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" diff --git a/src/script/api/script_companymode.cpp b/src/script/api/script_companymode.cpp index d260053e1..bf6da493c 100644 --- 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) { diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index 0eabdb731..6b343e438 100644 --- 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) diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp index c6fd1b583..4ba4e9f82 100644 --- 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" diff --git a/src/script/api/script_enginelist.cpp b/src/script/api/script_enginelist.cpp index 196f1ff1d..b6143a20e 100644 --- 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) { diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp index 8b3ef8c5f..382c6f0ba 100644 --- 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" diff --git a/src/script/api/script_execmode.cpp b/src/script/api/script_execmode.cpp index d0911e3f8..3617a22cf 100644 --- 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" diff --git a/src/script/api/script_game.cpp b/src/script/api/script_game.cpp index a6fd5da69..f0aeb191f 100644 --- 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() diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp index ba5e19e37..88369cf04 100644 --- 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" diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp index 63c022e90..3dfc50a09 100644 --- 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" diff --git a/src/script/api/script_grouplist.cpp b/src/script/api/script_grouplist.cpp index 80a00cd3e..39dd31002 100644 --- 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() diff --git a/src/script/api/script_infrastructure.cpp b/src/script/api/script_infrastructure.cpp index 2e318f1e5..2b1e203c8 100644 --- 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" diff --git a/src/script/api/script_news.cpp b/src/script/api/script_news.cpp index d2c5e9343..9319c8df0 100644 --- 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) { diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp index 074537540..707b734aa 100644 --- 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" /** diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp index 5bca48b9d..e4fb78dae 100644 --- 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" diff --git a/src/script/api/script_rail.cpp b/src/script/api/script_rail.cpp index f77894d92..e4f653e94 100644 --- 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" diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp index 352bb185e..f6dc922b4 100644 --- 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" diff --git a/src/script/api/script_station.cpp b/src/script/api/script_station.cpp index 152a83bd3..c42ed4a93 100644 --- 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" diff --git a/src/script/api/script_testmode.cpp b/src/script/api/script_testmode.cpp index 16472a118..81633844a 100644 --- 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" diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp index e8803884b..e9b51e2e7 100644 --- 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) : diff --git a/src/script/api/script_tile.cpp b/src/script/api/script_tile.cpp index a6bbf11ee..f6f016213 100644 --- 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) { diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp index c04115c8f..63093ecd5 100644 --- 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" diff --git a/src/script/api/script_tunnel.cpp b/src/script/api/script_tunnel.cpp index d7f6b853b..494628a8b 100644 --- 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) { diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp index 1818270e8..70ffbfd83 100644 --- 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) { diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp index 4620ce8f7..b2f699594 100644 --- 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 diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp index 23fd6b24e..5b515c52f 100644 --- 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() { diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp index 233bf09cc..552b1cf46 100644 --- 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 #include "../script/squirrel.hpp" #include "script_scanner.hpp" -- cgit v1.2.3-54-g00ecf