From a9a8bb35901ca431756eba4406f9da9dbc817829 Mon Sep 17 00:00:00 2001 From: smatz Date: Tue, 20 Jan 2009 13:56:35 +0000 Subject: (svn r15166) -Codechange: reduce number of includes in afterload.cpp --- src/engine_func.h | 3 --- src/saveload/afterload.cpp | 7 ------- src/saveload/saveload_internal.h | 4 ++++ 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/engine_func.h b/src/engine_func.h index 12d7514e7..df0ca0d99 100644 --- a/src/engine_func.h +++ b/src/engine_func.h @@ -10,9 +10,6 @@ void SetupEngines(); void StartupEngines(); -Engine *GetTempDataEngine(EngineID index); -void CopyTempEngineData(); - /* Original engine data counts and offsets */ extern const uint8 _engine_counts[4]; extern const uint8 _engine_offsets[4]; diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 3de834342..21d11f97a 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -7,35 +7,28 @@ #include "../tile_type.h" #include "../tile_map.h" #include "../map_type.h" -#include "../road_map.h" #include "../town.h" #include "../void_map.h" #include "../signs_base.h" #include "../window_func.h" -#include "../station_func.h" -#include "../company_base.h" #include "../fios.h" #include "../date_func.h" -#include "../engine_func.h" #include "../train.h" #include "../string_func.h" #include "../newgrf_config.h" #include "../gamelog.h" #include "../waypoint.h" #include "../station_map.h" -#include "../station_base.h" #include "../tunnelbridge_map.h" #include "../debug.h" #include "../network/network.h" #include "../openttd.h" #include "../gfxinit.h" -#include "../gfx_func.h" #include "../functions.h" #include "../industry_map.h" #include "../town_map.h" #include "../clear_map.h" #include "../engine_base.h" -#include "../landscape.h" #include "../vehicle_func.h" #include "../newgrf_station.h" #include "../yapf/yapf.hpp" diff --git a/src/saveload/saveload_internal.h b/src/saveload/saveload_internal.h index 7bb865d81..246f9e697 100644 --- a/src/saveload/saveload_internal.h +++ b/src/saveload/saveload_internal.h @@ -8,6 +8,7 @@ #include "../strings_type.h" #include "../company_manager_face.h" #include "../order_base.h" +#include "../engine_type.h" void InitializeOldNames(); StringID RemapOldStringID(StringID s); @@ -30,6 +31,9 @@ void ResetViewportAfterLoadGame(); void ConvertOldMultiheadToNew(); void ConnectMultiheadedTrains(); +Engine *GetTempDataEngine(EngineID index); +void CopyTempEngineData(); + extern int32 _saved_scrollpos_x; extern int32 _saved_scrollpos_y; -- cgit v1.2.3-54-g00ecf