From 0d3f5e6e74cae69d927a65a3d59c6391b713b987 Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 31 Jan 2009 20:16:06 +0000 Subject: (svn r15299) -Cleanup: remove many redundant includes --- src/saveload/afterload.cpp | 15 --------------- src/saveload/ai_sl.cpp | 2 -- src/saveload/autoreplace_sl.cpp | 1 - src/saveload/cargopacket_sl.cpp | 1 - src/saveload/company_sl.cpp | 2 -- src/saveload/engine_sl.cpp | 1 - src/saveload/map_sl.cpp | 1 - src/saveload/misc_sl.cpp | 1 - src/saveload/oldloader.cpp | 1 - src/saveload/oldloader_sl.cpp | 3 --- src/saveload/saveload.cpp | 5 ----- src/saveload/signs_sl.cpp | 3 --- src/saveload/strings_sl.cpp | 5 ----- src/saveload/town_sl.cpp | 2 -- src/saveload/vehicle_sl.cpp | 1 - 15 files changed, 44 deletions(-) (limited to 'src/saveload') diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index af22f844c..2b34622fc 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3,38 +3,24 @@ /** @file afterload.cpp Code updating data after game load */ #include "../stdafx.h" -#include "../strings_type.h" -#include "../tile_type.h" -#include "../tile_map.h" -#include "../map_type.h" -#include "../town.h" #include "../void_map.h" #include "../signs_base.h" #include "../window_func.h" #include "../fios.h" -#include "../date_func.h" #include "../train.h" #include "../string_func.h" -#include "../newgrf_config.h" #include "../gamelog.h" -#include "../waypoint.h" -#include "../station_map.h" -#include "../tunnelbridge_map.h" -#include "../debug.h" #include "../network/network.h" -#include "../openttd.h" #include "../gfxinit.h" #include "../functions.h" #include "../industry_map.h" #include "../town_map.h" #include "../clear_map.h" -#include "../engine_base.h" #include "../vehicle_func.h" #include "../newgrf_station.h" #include "../yapf/yapf.hpp" #include "../elrail_func.h" #include "../signs_func.h" -#include "../newgrf_house.h" #include "../aircraft.h" #include "../unmovable_map.h" #include "../tree_map.h" @@ -44,7 +30,6 @@ #include "table/strings.h" -#include "saveload.h" #include "saveload_internal.h" #include diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp index c88dcbc32..69f05d7fd 100644 --- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -3,12 +3,10 @@ /** @file ai_sl.cpp Handles the saveload part of the AIs */ #include "../stdafx.h" -#include "../openttd.h" #include "../company_base.h" #include "../company_func.h" #include "../debug.h" #include "saveload.h" -#include "../settings_type.h" #include "../string_func.h" #include "../ai/ai.hpp" #include "../ai/ai_config.hpp" diff --git a/src/saveload/autoreplace_sl.cpp b/src/saveload/autoreplace_sl.cpp index d24c290a8..7ed3a2051 100644 --- a/src/saveload/autoreplace_sl.cpp +++ b/src/saveload/autoreplace_sl.cpp @@ -3,7 +3,6 @@ /** @file autoreplace_sl.cpp Code handling saving and loading of autoreplace rules */ #include "../stdafx.h" -#include "../autoreplace_type.h" #include "../engine_type.h" #include "../group_type.h" #include "../autoreplace_base.h" diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp index d38e4e22e..c871d66c8 100644 --- a/src/saveload/cargopacket_sl.cpp +++ b/src/saveload/cargopacket_sl.cpp @@ -3,7 +3,6 @@ /** @file cargopacket_sl.cpp Code handling saving and loading of cargo packets */ #include "../stdafx.h" -#include "../openttd.h" #include "../cargopacket.h" #include "saveload.h" diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 8231e9f3d..22930f765 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -5,8 +5,6 @@ #include "../stdafx.h" #include "../company_base.h" #include "../company_func.h" -#include "../network/network.h" -#include "../ai/ai.hpp" #include "../company_manager_face.h" #include "saveload.h" diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp index 6dc47c56a..29772c625 100644 --- a/src/saveload/engine_sl.cpp +++ b/src/saveload/engine_sl.cpp @@ -3,7 +3,6 @@ /** @file engine_sl.cpp Code handling saving and loading of engines */ #include "../stdafx.h" -#include "saveload.h" #include "saveload_internal.h" #include "../engine_base.h" #include diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp index 00139dde9..005960582 100644 --- a/src/saveload/map_sl.cpp +++ b/src/saveload/map_sl.cpp @@ -3,7 +3,6 @@ /** @file map_sl.cpp Code handling saving and loading of map */ #include "../stdafx.h" -#include "../tile_type.h" #include "../map_func.h" #include "../core/alloc_type.hpp" #include "../core/bitmath_func.hpp" diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 5dd650c80..74086f934 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -7,7 +7,6 @@ #include "../variables.h" #include "../core/random_func.hpp" #include "../openttd.h" -#include "../tile_type.h" #include "../zoom_func.h" #include "../vehicle_func.h" #include "../window_gui.h" diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp index 5c1dd39ef..dd55a9e29 100644 --- a/src/saveload/oldloader.cpp +++ b/src/saveload/oldloader.cpp @@ -12,7 +12,6 @@ #include "table/strings.h" -#include "saveload.h" #include "saveload_internal.h" #include "oldloader.h" diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 1de407082..6052312b0 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -3,7 +3,6 @@ /** @file oldloader_sl.cpp Chunks and fix-ups for TTO/TTD/TTDP savegames. TTO loader code is based on SVXConverter by Roman Vetter. */ #include "../stdafx.h" -#include "../station_map.h" #include "../town.h" #include "../industry.h" #include "../company_func.h" @@ -19,9 +18,7 @@ #include "../date_func.h" #include "../vehicle_func.h" #include "../variables.h" -#include "../strings_func.h" #include "../effectvehicle_base.h" -#include "../string_func.h" #include "../core/mem_func.hpp" #include "../core/alloc_type.hpp" #include "saveload_internal.h" diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 466a67d53..43b0616f5 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -25,7 +25,6 @@ #include "../strings_func.h" #include "../gfx_func.h" #include "../core/alloc_func.hpp" -#include "../functions.h" #include "../core/endian_func.hpp" #include "../vehicle_base.h" #include "../company_func.h" @@ -37,11 +36,8 @@ #include "table/strings.h" -#include "saveload.h" #include "saveload_internal.h" -#include - extern const uint16 SAVEGAME_VERSION = 112; SavegameType _savegame_type; ///< type of savegame we are loading @@ -1160,7 +1156,6 @@ static void UninitNoComp() ********** START OF MEMORY CODE (in ram)**** ********************************************/ -#include "../table/sprites.h" #include "../gui.h" struct ThreadedSave { diff --git a/src/saveload/signs_sl.cpp b/src/saveload/signs_sl.cpp index 7dbb9e355..3006a50de 100644 --- a/src/saveload/signs_sl.cpp +++ b/src/saveload/signs_sl.cpp @@ -3,12 +3,9 @@ /** @file signs_sl.cpp Code handling saving and loading of economy data */ #include "../stdafx.h" -#include "../strings_func.h" #include "../company_func.h" #include "../signs_base.h" -#include "../signs_func.h" -#include "saveload_internal.h" #include "saveload.h" static const SaveLoad _sign_desc[] = { diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp index e220d687a..cd5cd187d 100644 --- a/src/saveload/strings_sl.cpp +++ b/src/saveload/strings_sl.cpp @@ -3,17 +3,12 @@ /** @file strings_sl.cpp Code handling saving and loading of strings */ #include "../stdafx.h" -#include "../strings_type.h" -#include "../core/math_func.hpp" -#include "../core/bitmath_func.hpp" #include "../core/alloc_func.hpp" #include "../string_func.h" #include "saveload_internal.h" #include "table/strings.h" -#include "saveload.h" - /** * Remap a string ID from the old format to the new format * @param s StringID that requires remapping diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index eaa3edaa3..dac520181 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -3,11 +3,9 @@ /** @file town_sl.cpp Code handling saving and loading of towns and houses */ #include "../stdafx.h" -#include "../town.h" #include "../newgrf_house.h" #include "../newgrf_commons.h" #include "../variables.h" -#include "../tile_map.h" #include "../town_map.h" #include "saveload.h" diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 90d7ef312..1bde737d6 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -3,7 +3,6 @@ /** @file vehicle_sl.cpp Code handling saving and loading of vehicles */ #include "../stdafx.h" -#include "../vehicle_base.h" #include "../vehicle_func.h" #include "../train.h" #include "../roadveh.h" -- cgit v1.2.3-70-g09d2