Codechange: Cleanup unnecessary includes of spritecache.h (#14678)

src/aircraft_cmd.cpp

@@ -16,7 +16,6 @@
 #include "news_func.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
-#include "spritecache.h"
 #include "error_func.h"
 #include "strings_func.h"
 #include "command_func.h"

src/aircraft_gui.cpp

@@ -14,7 +14,6 @@
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "window_gui.h"
-#include "spritecache.h"
 #include "zoom_func.h"
 
 #include "table/strings.h"

src/depot_gui.cpp

@@ -17,7 +17,7 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "depot_base.h"
-#include "spritecache.h"
+#include "spritecache_type.h"
 #include "strings_func.h"
 #include "sound_func.h"
 #include "vehicle_func.h"

src/fontcache.h

@@ -10,9 +10,9 @@
 #ifndef FONTCACHE_H
 #define FONTCACHE_H
 
+#include "gfx_type.h"
 #include "provider_manager.h"
-#include "string_type.h"
-#include "spritecache.h"
+#include "spritecache_type.h"
 
 /** Glyphs are characters from a font. */
 typedef uint32_t GlyphID;

src/fontcache/spritefontcache.cpp

@@ -10,6 +10,7 @@
 #include "../stdafx.h"
 #include "../fontcache.h"
 #include "../gfx_layout.h"
+#include "../spritecache.h"
 #include "../string_func.h"
 #include "../zoom_func.h"
 #include "spritefontcache.h"

src/newgrf/newgrf_act12.cpp

@@ -10,6 +10,7 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../fontcache.h"
+#include "../spritecache.h"
 #include "newgrf_bytereader.h"
 #include "newgrf_internal.h"
 

src/newgrf_canal.cpp

@@ -13,7 +13,6 @@
 #include "newgrf_canal.h"
 #include "water.h"
 #include "water_map.h"
-#include "spritecache.h"
 
 #include "safeguards.h"
 

src/rail_gui.cpp

@@ -29,7 +29,6 @@
 #include "dropdown_func.h"
 #include "tunnelbridge.h"
 #include "tilehighlight_func.h"
-#include "spritecache.h"
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "engine_base.h"

src/roadveh_cmd.cpp

@@ -28,7 +28,6 @@
 #include "depot_map.h"
 #include "effectvehicle_func.h"
 #include "roadstop_base.h"
-#include "spritecache.h"
 #include "core/random_func.hpp"
 #include "company_base.h"
 #include "core/backup_type.hpp"

src/ship_cmd.cpp

@@ -19,7 +19,6 @@
 #include "pathfinder/yapf/yapf.h"
 #include "pathfinder/yapf/yapf_ship_regions.h"
 #include "newgrf_sound.h"
-#include "spritecache.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "timer/timer_game_calendar.h"

src/ship_gui.cpp

@@ -14,7 +14,6 @@
 #include "vehicle_gui.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
-#include "spritecache.h"
 #include "zoom_func.h"
 
 #include "table/strings.h"

src/spritecache_internal.h

@@ -13,7 +13,7 @@
 #include "core/math_func.hpp"
 #include "gfx_type.h"
 #include "spritecache_type.h"
-#include "spriteloader/spriteloader.hpp"
+#include "spriteloader/sprite_file_type.hpp"
 
 #include "table/sprites.h"
 

src/train_cmd.cpp

@@ -26,7 +26,6 @@
 #include "newgrf_station.h"
 #include "effectvehicle_func.h"
 #include "network/network.h"
-#include "spritecache.h"
 #include "core/random_func.hpp"
 #include "company_base.h"
 #include "newgrf.h"

src/vehicle_gui.cpp

@@ -30,7 +30,6 @@
 #include "dropdown_func.h"
 #include "timetable.h"
 #include "articulated_vehicles.h"
-#include "spritecache.h"
 #include "core/geometry_func.hpp"
 #include "core/container_func.hpp"
 #include "company_base.h"