Mercurial > hg > openttd
changeset 8787:ff327b646d49 draft
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 31 Mar 2008 06:42:26 +0000 |
| parents | e2d4956b7251 |
| children | cb5ca4d081de |
| files | src/misc_gui.cpp src/newgrf.cpp src/newgrf.h src/newgrf_sound.h src/newgrf_spritegroup.h src/newgrf_station.h src/newgrf_text.cpp src/openttd.cpp src/order_cmd.cpp src/order_gui.cpp src/station_base.h src/station_func.h src/station_gui.cpp src/station_map.h src/station_type.h src/town_cmd.cpp src/water_cmd.cpp src/waypoint.cpp |
| diffstat | 18 files changed, 38 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -40,6 +40,7 @@ #include "string_func.h" #include "player_gui.h" #include "settings_type.h" +#include "newgrf_cargo.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -25,6 +25,7 @@ #include "newgrf_house.h" #include "newgrf_sound.h" #include "newgrf_spritegroup.h" +#include "newgrf_station.h" #include "cargotype.h" #include "industry.h" #include "newgrf_canal.h"
--- a/src/newgrf.h +++ b/src/newgrf.h @@ -9,7 +9,7 @@ #include "newgrf_config.h" #include "cargotype.h" #include "industry_type.h" -#include "newgrf_station.h" +#include "station_type.h" enum GrfLoadingStage { GLS_FILESCAN,
--- a/src/newgrf_sound.h +++ b/src/newgrf_sound.h @@ -6,6 +6,7 @@ #define NEWGRF_SOUND_H #include "sound_type.h" +#include "tile_type.h" enum VehicleSoundEvent { VSE_START = 1,
--- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -7,10 +7,15 @@ #include "town_type.h" #include "industry_type.h" -#include "newgrf_storage.h" #include "core/bitmath_func.hpp" #include "gfx_type.h" +#include "engine_type.h" +#include "tile_type.h" + +#include "newgrf_cargo.h" +#include "newgrf_callbacks.h" #include "newgrf_generic.h" +#include "newgrf_storage.h" /** * Gets the value of a so-called newgrf "register".
--- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -123,12 +123,6 @@ SpriteID GetCustomStationGroundRelocation(const StationSpec *statspec, const Station *st, TileIndex tile); uint16 GetStationCallback(CallbackID callback, uint32 param1, uint32 param2, const StationSpec *statspec, const Station *st, TileIndex tile); -/* Check if a rail station tile is traversable. */ -bool IsStationTileBlocked(TileIndex tile); - -/* Check if a rail station tile is electrifiable. */ -bool IsStationTileElectrifiable(TileIndex tile); - /* Allocate a StationSpec to a Station. This is called once per build operation. */ int AllocateSpecToStation(const StationSpec *statspec, Station *st, bool exec);
--- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -19,6 +19,7 @@ #include "core/alloc_func.hpp" #include "newgrf_storage.h" #include "string_func.h" +#include "date_type.h" #include "table/strings.h" #include "table/control_codes.h"
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -9,15 +9,11 @@ #include "saveload.h" #include "openttd.h" -#include "bridge_map.h" #include "mixer.h" #include "spritecache.h" #include "gfxinit.h" #include "gui.h" #include "landscape.h" -#include "station_map.h" -#include "town_map.h" -#include "tunnel_map.h" #include "viewport_func.h" #include "gfx_func.h" #include "window_func.h" @@ -44,7 +40,6 @@ #include "yapf/yapf.h" #include "settings_func.h" #include "genworld.h" -#include "clear_map.h" #include "fontcache.h" #include "newgrf.h" #include "newgrf_config.h" @@ -64,15 +59,19 @@ #include "sound_func.h" #include "variables.h" #include "road_func.h" +#include "newgrf_station.h" -#include "bridge_map.h" #include "clear_map.h" +#include "tree_map.h" #include "rail_map.h" #include "road_map.h" -#include "water_map.h" +#include "station_map.h" +#include "town_map.h" #include "industry_map.h" #include "unmovable_map.h" -#include "tree_map.h" +#include "tunnel_map.h" +#include "bridge_map.h" +#include "water_map.h" #include "tunnelbridge_map.h" #include "void_map.h" #include "water.h"
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -22,6 +22,7 @@ #include "window_func.h" #include "settings_type.h" #include "string_func.h" +#include "newgrf_cargo.h" #include "table/strings.h"
--- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -25,6 +25,7 @@ #include "vehicle_func.h" #include "settings_type.h" #include "player_func.h" +#include "newgrf_cargo.h" #include "table/sprites.h" #include "table/strings.h"
--- a/src/station_base.h +++ b/src/station_base.h @@ -11,7 +11,11 @@ #include "cargopacket.h" #include "cargo_type.h" #include "town_type.h" -#include "newgrf_station.h" +#include "strings_type.h" +#include "date_type.h" +#include "vehicle_type.h" +#include "player_type.h" +#include "core/geometry_type.hpp" #include <list> DECLARE_OLD_POOL(Station, Station, 6, 1000)
--- a/src/station_func.h +++ b/src/station_func.h @@ -7,6 +7,7 @@ #include "station_type.h" #include "sprite.h" +#include "rail_type.h" #include "road_type.h" #include "tile_type.h" #include "cargo_type.h" @@ -40,4 +41,11 @@ void DeleteOilRig(TileIndex t); +/* Check if a rail station tile is traversable. */ +bool IsStationTileBlocked(TileIndex tile); + +/* Check if a rail station tile is electrifiable. */ +bool IsStationTileElectrifiable(TileIndex tile); + + #endif /* STATION_FUNC_H */
--- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -24,6 +24,7 @@ #include "viewport_func.h" #include "gfx_func.h" #include "widgets/dropdown_func.h" +#include "newgrf_cargo.h" #include "table/strings.h" #include "table/sprites.h"
--- a/src/station_map.h +++ b/src/station_map.h @@ -11,7 +11,6 @@ #include "station_func.h" #include "station_base.h" #include "rail.h" -#include "newgrf_station.h" typedef byte StationGfx;
--- a/src/station_type.h +++ b/src/station_type.h @@ -10,6 +10,7 @@ struct Station; struct RoadStop; +struct StationSpec; static const StationID INVALID_STATION = 0xFFFF;
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -39,6 +39,7 @@ #include "strings_func.h" #include "window_func.h" #include "string_func.h" +#include "newgrf_cargo.h" #include "table/strings.h" #include "table/sprites.h"