From 2786d789a15990a27b73c0a4fbceb429e7dac953 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 26 Dec 2007 11:45:43 +0000 Subject: [PATCH] (svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h). --- src/ai/default/default.cpp | 1 - src/ai/trolly/build.cpp | 1 - src/ai/trolly/pathfinder.cpp | 1 - src/ai/trolly/shared.cpp | 2 +- src/ai/trolly/trolly.cpp | 1 - src/aircraft_cmd.cpp | 1 - src/aircraft_gui.cpp | 1 - src/airport.cpp | 1 - src/airport.h | 2 +- src/airport_gui.cpp | 1 - src/bridge_gui.cpp | 2 +- src/bridge_map.h | 1 - src/clear_cmd.cpp | 1 - src/command.cpp | 1 - src/console_cmds.cpp | 1 + src/depot.cpp | 1 - src/disaster_cmd.cpp | 1 - src/dock_gui.cpp | 2 +- src/economy.cpp | 1 - src/engine.h | 2 +- src/functions.h | 5 --- src/genworld.cpp | 2 +- src/industry.h | 2 +- src/industry_cmd.cpp | 1 - src/industry_gui.cpp | 2 +- src/landscape.cpp | 1 - src/main_gui.cpp | 1 - src/map.cpp | 3 +- src/{map.h => map_func.h} | 84 +++++++++++++----------------------- src/map_type.h | 65 ++++++++++++++++++++++++++++ src/misc.cpp | 2 +- src/misc_gui.cpp | 1 - src/network/network.cpp | 2 +- src/network/network_udp.cpp | 2 +- src/npf.cpp | 3 +- src/npf.h | 3 +- src/oldloader.cpp | 1 - src/openttd.cpp | 1 - src/order_gui.cpp | 1 - src/pathfind.cpp | 1 - src/players.cpp | 1 - src/rail_cmd.cpp | 1 - src/rail_gui.cpp | 1 - src/road_cmd.cpp | 1 - src/road_gui.cpp | 2 +- src/roadveh_cmd.cpp | 1 - src/screenshot.cpp | 2 +- src/ship_cmd.cpp | 1 - src/signs.cpp | 1 + src/signs_gui.cpp | 1 + src/smallmap_gui.cpp | 1 - src/sound.cpp | 2 +- src/station.cpp | 1 - src/station_cmd.cpp | 1 - src/tgp.cpp | 1 - src/tile_map.h | 2 +- src/town_cmd.cpp | 1 - src/train_cmd.cpp | 1 - src/tree_cmd.cpp | 1 - src/tunnel_map.h | 1 - src/tunnelbridge_cmd.cpp | 1 - src/tunnelbridge_map.h | 7 ++- src/unmovable_cmd.cpp | 1 - src/vehicle.cpp | 1 - src/viewport.cpp | 1 - src/water_cmd.cpp | 1 - src/waypoint.cpp | 1 - src/window.cpp | 3 +- src/window_gui.h | 2 +- src/yapf/track_dir.hpp | 3 -- 70 files changed, 124 insertions(+), 129 deletions(-) rename src/{map.h => map_func.h} (84%) create mode 100644 src/map_type.h diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 8c016afc7e..dbedb9720f 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -6,7 +6,6 @@ #include "../../bridge_map.h" #include "../../tile_cmd.h" #include "../../landscape.h" -#include "../../map.h" #include "../../rail_map.h" #include "../../road_map.h" #include "../../roadveh.h" diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp index 932e23acaf..3b6b044eca 100644 --- a/src/ai/trolly/build.cpp +++ b/src/ai/trolly/build.cpp @@ -3,7 +3,6 @@ #include "../../stdafx.h" #include "../../openttd.h" #include "../../debug.h" -#include "../../map.h" #include "../../road_map.h" #include "../../vehicle.h" #include "../../command_func.h" diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp index c97e080c71..a3bc55c8f5 100644 --- a/src/ai/trolly/pathfinder.cpp +++ b/src/ai/trolly/pathfinder.cpp @@ -4,7 +4,6 @@ #include "../../openttd.h" #include "../../bridge_map.h" #include "../../debug.h" -#include "../../map.h" #include "../../command_func.h" #include "trolly.h" #include "../../depot.h" diff --git a/src/ai/trolly/shared.cpp b/src/ai/trolly/shared.cpp index e683b60ea4..6af9c199d5 100644 --- a/src/ai/trolly/shared.cpp +++ b/src/ai/trolly/shared.cpp @@ -3,7 +3,7 @@ #include "../../stdafx.h" #include "../../openttd.h" #include "../../debug.h" -#include "../../map.h" +#include "../../map_func.h" #include "trolly.h" #include "../../vehicle.h" diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index 388d59906d..d03ea19b26 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -23,7 +23,6 @@ #include "../../road_map.h" #include "../../station_map.h" #include "table/strings.h" -#include "../../map.h" #include "../../command_func.h" #include "trolly.h" #include "../../town.h" diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 39728ffdc1..38cc6f8555 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -10,7 +10,6 @@ #include "landscape.h" #include "station_map.h" #include "table/strings.h" -#include "map.h" #include "vehicle.h" #include "timetable.h" #include "depot.h" diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp index d33722c142..1db8282450 100644 --- a/src/aircraft_gui.cpp +++ b/src/aircraft_gui.cpp @@ -8,7 +8,6 @@ #include "debug.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "gui.h" #include "vehicle.h" #include "engine.h" diff --git a/src/airport.cpp b/src/airport.cpp index f32df33025..719be3dd71 100644 --- a/src/airport.cpp +++ b/src/airport.cpp @@ -5,7 +5,6 @@ #include "stdafx.h" #include "openttd.h" #include "debug.h" -#include "map.h" #include "airport.h" #include "variables.h" #include "airport_movement.h" diff --git a/src/airport.h b/src/airport.h index f8f9e2bc4a..f86aadf103 100644 --- a/src/airport.h +++ b/src/airport.h @@ -6,7 +6,7 @@ #define AIRPORT_H #include "direction_type.h" -#include "map.h" +#include "map_type.h" enum {MAX_TERMINALS = 10}; enum {MAX_HELIPADS = 4}; diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 8052f5df20..cd9abc8780 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -6,7 +6,6 @@ #include "openttd.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "window_gui.h" #include "gui.h" #include "station_gui.h" diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index 8d8d9fa996..a158300df0 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -5,7 +5,6 @@ #include "stdafx.h" #include "openttd.h" #include "table/strings.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "viewport.h" @@ -16,6 +15,7 @@ #include "bridge.h" #include "strings_func.h" #include "window_func.h" +#include "map_func.h" static struct BridgeData { uint8 last_size; diff --git a/src/bridge_map.h b/src/bridge_map.h index ac6826fb1f..a47a625e24 100644 --- a/src/bridge_map.h +++ b/src/bridge_map.h @@ -6,7 +6,6 @@ #define BRIDGE_MAP_H #include "direction_func.h" -#include "map.h" #include "rail_type.h" #include "road_map.h" diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp index a67490210e..270285b1c0 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -7,7 +7,6 @@ #include "clear_map.h" #include "rail_map.h" #include "table/strings.h" -#include "map.h" #include "player.h" #include "viewport.h" #include "command_func.h" diff --git a/src/command.cpp b/src/command.cpp index 141957abc5..fcbeefa18f 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -6,7 +6,6 @@ #include "openttd.h" #include "table/strings.h" #include "landscape.h" -#include "map.h" #include "tile_map.h" #include "gui.h" #include "command_func.h" diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 2cf4fb9d7e..c259148317 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -29,6 +29,7 @@ #include "viewport.h" #include "window_func.h" #include "functions.h" +#include "map_func.h" // ** scriptfile handling ** // static FILE *_script_file; diff --git a/src/depot.cpp b/src/depot.cpp index 49327a3def..5b89839eca 100644 --- a/src/depot.cpp +++ b/src/depot.cpp @@ -7,7 +7,6 @@ #include "vehicle.h" #include "depot.h" #include "landscape.h" -#include "map.h" #include "table/strings.h" #include "saveload.h" #include "order.h" diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index 1a69e36c03..592b54d400 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -23,7 +23,6 @@ #include "industry_map.h" #include "station_map.h" #include "table/strings.h" -#include "map.h" #include "vehicle.h" #include "command_func.h" #include "tile_cmd.h" diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index 1a8a8f911c..d0030d8d43 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -6,7 +6,6 @@ #include "openttd.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "tile_map.h" #include "station.h" #include "gui.h" @@ -18,6 +17,7 @@ #include "variables.h" #include "water.h" #include "window_func.h" +#include "vehicle.h" static void ShowBuildDockStationPicker(); static void ShowBuildDocksDepotPicker(); diff --git a/src/economy.cpp b/src/economy.cpp index 7bea083b2f..28a7a50e06 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -8,7 +8,6 @@ #include "landscape.h" #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "news.h" #include "player.h" #include "station.h" diff --git a/src/engine.h b/src/engine.h index 9e28157409..ce9795ab91 100644 --- a/src/engine.h +++ b/src/engine.h @@ -123,7 +123,7 @@ struct Engine { PlayerByte preview_player; byte preview_wait; byte player_avail; - VehicleType type; ///< type, ie VEH_ROAD, VEH_TRAIN, etc. Same as in vehicle.h + VehicleType type; ///< type, ie VEH_ROAD, VEH_TRAIN, etc. }; /** diff --git a/src/functions.h b/src/functions.h index 361d6491ac..3afdcebbf2 100644 --- a/src/functions.h +++ b/src/functions.h @@ -9,7 +9,6 @@ #include "command_type.h" #include "openttd.h" #include "tile_cmd.h" -#include "map.h" /* clear_land.cpp */ void DrawHillyLandTile(const TileInfo *ti); @@ -24,10 +23,6 @@ void SubtractMoneyFromPlayerFract(PlayerID player, CommandCost cost); bool CheckOwnership(Owner owner); bool CheckTileOwnership(TileIndex tile); -/* openttd.cpp */ -static inline TileIndex RandomTileSeed(uint32 r) { return TILE_MASK(r); } -static inline TileIndex RandomTile() { return TILE_MASK(Random()); } - /* texteff.cpp */ void AddAnimatedTile(TileIndex tile); void DeleteAnimatedTile(TileIndex tile); diff --git a/src/genworld.cpp b/src/genworld.cpp index 28fbdcfe50..418bfb8124 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -19,7 +19,7 @@ #include "heightmap.h" #include "date.h" #include "viewport.h" -#include "map.h" +#include "map_func.h" void GenerateClearTile(); void GenerateIndustries(); diff --git a/src/industry.h b/src/industry.h index 8809b5ffe1..1350b351a9 100644 --- a/src/industry.h +++ b/src/industry.h @@ -10,7 +10,7 @@ #include "newgrf_storage.h" #include "cargo_type.h" #include "economy_type.h" -#include "map.h" +#include "map_type.h" #include "slope_type.h" typedef uint16 IndustryGfx; diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index fff83d3ffd..b332efd9dd 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -9,7 +9,6 @@ #include "station_map.h" #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "train.h" #include "landscape.h" #include "viewport.h" diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 646275bdad..ce4f740b38 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -7,7 +7,6 @@ #include "debug.h" #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "textbuf_gui.h" @@ -23,6 +22,7 @@ #include "newgrf_text.h" #include "date.h" #include "strings_func.h" +#include "map_func.h" bool _ignore_restrictions; diff --git a/src/landscape.cpp b/src/landscape.cpp index 3e5ae6bcc4..0dc998ffc0 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -6,7 +6,6 @@ #include "heightmap.h" #include "clear_map.h" #include "date.h" -#include "map.h" #include "player.h" #include "spritecache.h" #include "table/sprites.h" diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 26b369e959..5fc5e4c2d0 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -10,7 +10,6 @@ #include "station.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "window_func.h" diff --git a/src/map.cpp b/src/map.cpp index 3df9470a8b..0bdfbe3552 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3,13 +3,12 @@ /** @file map.cpp */ #include "stdafx.h" -#include "openttd.h" #include "debug.h" -#include "map.h" #include "direction_func.h" #include "core/bitmath_func.hpp" #include "core/alloc_func.hpp" #include "core/math_func.hpp" +#include "map_func.h" #if defined(_MSC_VER) && _MSC_VER >= 1400 /* VStudio 2005 is stupid! */ /* Why the hell is that not in all MSVC headers?? */ diff --git a/src/map.h b/src/map_func.h similarity index 84% rename from src/map.h rename to src/map_func.h index 887f396eb6..28bf80a27c 100644 --- a/src/map.h +++ b/src/map_func.h @@ -2,12 +2,12 @@ /** @file map.h */ -#ifndef MAP_H -#define MAP_H +#ifndef MAP_FUNC_H +#define MAP_FUNC_H -#include "stdafx.h" -#include "direction_func.h" #include "tile_type.h" +#include "map_type.h" +#include "direction_func.h" extern uint _map_tile_mask; @@ -24,28 +24,6 @@ extern uint _map_tile_mask; */ #define TILE_ASSERT(x) assert(TILE_MASK(x) == (x)); -/** - * Data that is stored per tile. Also used TileExtended for this. - * Look at docs/landscape.html for the exact meaning of the members. - */ -struct Tile { - byte type_height; ///< The type (bits 4..7) and height of the northern corner - byte m1; ///< Primarily used for ownership information - uint16 m2; ///< Primarily used for indices to towns, industries and stations - byte m3; ///< General purpose - byte m4; ///< General purpose - byte m5; ///< General purpose - byte m6; ///< Primarily used for bridges and rainforest/desert -}; - -/** - * Data that is stored per tile. Also used Tile for this. - * Look at docs/landscape.html for the exact meaning of the members. - */ -struct TileExtended { - byte m7; ///< Primarily used for newgrf support -}; - /** * Pointer to the tile-array. * @@ -206,17 +184,6 @@ static inline uint TileY(TileIndex tile) return tile >> MapLogX(); } -/** - * A pair-construct of a TileIndexDiff. - * - * This can be used to save the difference between to - * tiles as a pair of x and y value. - */ -struct TileIndexDiffC { - int16 x; ///< The x value of the coordinate - int16 y; ///< The y value of the coordinate -}; - /** * Return the offset between to tiles from a TileIndexDiffC struct. * @@ -234,13 +201,13 @@ static inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc) #ifndef _DEBUG - /** - * Adds to tiles together. - * - * @param x One tile - * @param y An other tile to add - * @return The resulting tile(index) - */ + /** + * Adds to tiles together. + * + * @param x One tile + * @param y An other tile to add + * @return The resulting tile(index) + */ #define TILE_ADD(x,y) ((x) + (y)) #else extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add, @@ -275,6 +242,7 @@ static inline TileIndexDiffC TileIndexDiffCByDiagDir(DiagDirection dir) assert(IsValidDiagDirection(dir)); return _tileoffs_by_diagdir[dir]; } + /** * Add a TileIndexDiffC to a TileIndex and returns the new one. * @@ -400,14 +368,22 @@ typedef bool TestTileOnSearchProc(TileIndex tile, uint32 data); */ bool CircularTileSearch(TileIndex tile, uint size, TestTileOnSearchProc proc, uint32 data); -/** Approximation of the length of a straight track, relative to a diagonal - * track (ie the size of a tile side). - * - * #defined instead of const so it can - * stay integer. (no runtime float operations) Is this needed? - * Watch out! There are _no_ brackets around here, to prevent intermediate - * rounding! Be careful when using this! - * This value should be sqrt(2)/2 ~ 0.7071 */ -#define STRAIGHT_TRACK_LENGTH 7071/10000 +/** + * Get a random tile out of a given seed. + * @param r the random 'seed' + * @return a valid tile + */ +static inline TileIndex RandomTileSeed(uint32 r) +{ + return TILE_MASK(r); +} -#endif /* MAP_H */ +/** + * Get a valid random tile. + * @note a define so 'random' gets inserted in the place where it is actually + * called, thus making the random traces more explicit. + * @return a valid tile + */ +#define RandomTile() RandomTileSeed(Random()) + +#endif /* MAP_FUNC_H */ diff --git a/src/map_type.h b/src/map_type.h new file mode 100644 index 0000000000..7098ad7622 --- /dev/null +++ b/src/map_type.h @@ -0,0 +1,65 @@ +/* $Id$ */ + +/** @file map_type.h Types related to maps. */ + +#ifndef MAP_TYPE_H +#define MAP_TYPE_H + +/** + * Data that is stored per tile. Also used TileExtended for this. + * Look at docs/landscape.html for the exact meaning of the members. + */ +struct Tile { + byte type_height; ///< The type (bits 4..7) and height of the northern corner + byte m1; ///< Primarily used for ownership information + uint16 m2; ///< Primarily used for indices to towns, industries and stations + byte m3; ///< General purpose + byte m4; ///< General purpose + byte m5; ///< General purpose + byte m6; ///< Primarily used for bridges and rainforest/desert +}; + +/** + * Data that is stored per tile. Also used Tile for this. + * Look at docs/landscape.html for the exact meaning of the members. + */ +struct TileExtended { + byte m7; ///< Primarily used for newgrf support +}; + +/** + * An offset value between to tiles. + * + * This value is used fro the difference between + * to tiles. It can be added to a tileindex to get + * the resulting tileindex of the start tile applied + * with this saved difference. + * + * @see TileDiffXY(int, int) + */ +typedef int32 TileIndexDiff; + +/** + * A pair-construct of a TileIndexDiff. + * + * This can be used to save the difference between to + * tiles as a pair of x and y value. + */ +struct TileIndexDiffC { + int16 x; ///< The x value of the coordinate + int16 y; ///< The y value of the coordinate +}; + +/** + * Approximation of the length of a straight track, relative to a diagonal + * track (ie the size of a tile side). + * + * #defined instead of const so it can + * stay integer. (no runtime float operations) Is this needed? + * Watch out! There are _no_ brackets around here, to prevent intermediate + * rounding! Be careful when using this! + * This value should be sqrt(2)/2 ~ 0.7071 + */ +#define STRAIGHT_TRACK_LENGTH 7071/10000 + +#endif /* MAP_TYPE_H */ diff --git a/src/misc.cpp b/src/misc.cpp index 5a8eb7068e..4a297d007f 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -11,7 +11,6 @@ #include "string.h" #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "vehicle.h" #include "saveload.h" #include "engine.h" @@ -26,6 +25,7 @@ #include "economy_func.h" #include "zoom_func.h" #include "functions.h" +#include "map_func.h" char _name_array[512][32]; diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 8649dd3cf9..da8f773c34 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -13,7 +13,6 @@ #include "table/sprites.h" #include "table/strings.h" #include "table/tree_land.h" -#include "map.h" #include "tile_map.h" #include "gui.h" #include "window_gui.h" diff --git a/src/network/network.cpp b/src/network/network.cpp index 187b742116..f7689d1165 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -11,7 +11,7 @@ extern const char _openttd_revision[]; #include "../debug.h" #include "../string.h" #include "../strings_func.h" -#include "../map.h" +#include "../map_func.h" #include "../command_func.h" #include "../variables.h" #include "../date.h" diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index cb29e54ce8..7388df6ec9 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -14,7 +14,7 @@ #include "../string.h" #include "network_data.h" #include "../date.h" -#include "../map.h" +#include "../map_func.h" #include "network_gamelist.h" #include "network_udp.h" #include "../variables.h" diff --git a/src/npf.cpp b/src/npf.cpp index 94bdf1f02c..8b07868888 100644 --- a/src/npf.cpp +++ b/src/npf.cpp @@ -4,12 +4,13 @@ #include "stdafx.h" #include "openttd.h" +#include "npf.h" +#include "vehicle.h" #include "bridge_map.h" #include "debug.h" #include "tile_cmd.h" #include "bridge.h" #include "landscape.h" -#include "npf.h" #include "aystar.h" #include "pathfind.h" #include "station.h" diff --git a/src/npf.h b/src/npf.h index 124d173819..19c0f41b21 100644 --- a/src/npf.h +++ b/src/npf.h @@ -8,8 +8,9 @@ #include "openttd.h" #include "aystar.h" #include "station.h" -#include "vehicle.h" +#include "vehicle_type.h" #include "tile_type.h" +#include "track_type.h" /* mowing grass */ enum { diff --git a/src/oldloader.cpp b/src/oldloader.cpp index 3025500903..7deb8d22c9 100644 --- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -6,7 +6,6 @@ #include "openttd.h" #include "station_map.h" #include "table/strings.h" -#include "map.h" #include "town.h" #include "industry.h" #include "station.h" diff --git a/src/openttd.cpp b/src/openttd.cpp index 560c3f42e7..616aae591f 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -8,7 +8,6 @@ #include "debug.h" #include "driver.h" #include "saveload.h" -#include "map.h" #include "openttd.h" #include "table/strings.h" diff --git a/src/order_gui.cpp b/src/order_gui.cpp index e232c34aee..ac3683e022 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -8,7 +8,6 @@ #include "station_map.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "vehicle.h" diff --git a/src/pathfind.cpp b/src/pathfind.cpp index 87a66ba504..616f4e0eb5 100644 --- a/src/pathfind.cpp +++ b/src/pathfind.cpp @@ -9,7 +9,6 @@ #include "depot.h" #include "tile_cmd.h" #include "landscape.h" -#include "map.h" #include "pathfind.h" #include "rail_type.h" #include "debug.h" diff --git a/src/players.cpp b/src/players.cpp index 92846d70c7..34aa255347 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -8,7 +8,6 @@ #include "string.h" #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "player.h" #include "town.h" #include "vehicle.h" diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index ee2d1e6296..2cdcbabc8d 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -13,7 +13,6 @@ #include "road_map.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "landscape.h" #include "town_map.h" #include "tunnel_map.h" diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 367f47183e..85a8ec5631 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -9,7 +9,6 @@ #include "tile_cmd.h" #include "landscape.h" #include "date.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "station_gui.h" diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 66a2041e6c..3242966fca 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -14,7 +14,6 @@ #include "table/sprites.h" #include "table/strings.h" #include "tile_cmd.h" -#include "map.h" #include "landscape.h" #include "town_map.h" #include "vehicle.h" diff --git a/src/road_gui.cpp b/src/road_gui.cpp index e9d4c4a96f..cde258ee3c 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -6,7 +6,6 @@ #include "openttd.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "station_gui.h" @@ -17,6 +16,7 @@ #include "road_cmd.h" #include "road_map.h" #include "station_map.h" +#include "vehicle.h" //needed for catchments #include "station.h" #include "functions.h" diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index fbe0571d5a..5a6fcd072b 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -11,7 +11,6 @@ #include "roadveh.h" #include "station_map.h" #include "table/strings.h" -#include "map.h" #include "vehicle.h" #include "timetable.h" #include "engine.h" diff --git a/src/screenshot.cpp b/src/screenshot.cpp index e3d6f3911c..ea377981c7 100644 --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -17,7 +17,7 @@ #include "zoom_func.h" #include "core/alloc_func.hpp" #include "core/endian_func.hpp" -#include "map.h" +#include "map_func.h" char _screenshot_format_name[8]; uint _num_screenshot_formats; diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index adb1cf861a..e318689be0 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -8,7 +8,6 @@ #include "table/strings.h" #include "tile_cmd.h" #include "landscape.h" -#include "map.h" #include "vehicle.h" #include "timetable.h" #include "command_func.h" diff --git a/src/signs.cpp b/src/signs.cpp index 082ae45208..628d517cfd 100644 --- a/src/signs.cpp +++ b/src/signs.cpp @@ -18,6 +18,7 @@ #include "zoom_func.h" #include "functions.h" #include "window_func.h" +#include "map_func.h" SignID _new_sign_id; uint _total_signs; diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 03735a3af4..f806ac50ff 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -17,6 +17,7 @@ #include "strings_func.h" #include "core/alloc_func.hpp" #include "window_func.h" +#include "map_func.h" static const Sign **_sign_sort; static uint _num_sign_sort; diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index c0fa68e5f9..3b42564f99 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -12,7 +12,6 @@ #include "table/strings.h" #include "table/sprites.h" #include "landscape.h" -#include "map.h" #include "gui.h" #include "window_gui.h" #include "tree_map.h" diff --git a/src/sound.cpp b/src/sound.cpp index 659934550b..02017f861f 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -5,7 +5,6 @@ #include "stdafx.h" #include "openttd.h" #include "landscape.h" -#include "map.h" #include "mixer.h" #include "sound.h" #include "vehicle.h" @@ -15,6 +14,7 @@ #include "fios.h" #include "window_gui.h" #include "core/alloc_func.hpp" +#include "map_func.h" static uint _file_count; static FileEntry *_files; diff --git a/src/station.cpp b/src/station.cpp index dfc5b2e59b..49b26707ba 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -9,7 +9,6 @@ #include "station_map.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "station.h" #include "viewport.h" #include "town.h" diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 9c93f8d229..e7ad0b8c3d 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -14,7 +14,6 @@ #include "station_map.h" #include "table/sprites.h" #include "table/strings.h" -#include "map.h" #include "station.h" #include "viewport.h" #include "command_func.h" diff --git a/src/tgp.cpp b/src/tgp.cpp index 5310cb168f..ce44df9608 100644 --- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -6,7 +6,6 @@ #include #include "openttd.h" #include "clear_map.h" -#include "map.h" #include "table/strings.h" #include "clear_map.h" #include "variables.h" diff --git a/src/tile_map.h b/src/tile_map.h index 1e7ad67edc..faf5f8dd6a 100644 --- a/src/tile_map.h +++ b/src/tile_map.h @@ -7,7 +7,7 @@ #include "tile_type.h" #include "slope_type.h" -#include "map.h" +#include "map_func.h" #include "core/bitmath_func.hpp" /** diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 3bf97bc4dd..bce49db024 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -10,7 +10,6 @@ #include "road_internal.h" /* Cleaning up road bits */ #include "table/strings.h" #include "table/sprites.h" -#include "map.h" #include "landscape.h" #include "town_map.h" #include "tunnel_map.h" diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index c8f4c14a88..107192f4e4 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -11,7 +11,6 @@ #include "gui.h" #include "station_map.h" #include "table/strings.h" -#include "map.h" #include "tunnel_map.h" #include "vehicle.h" #include "timetable.h" diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index a70203197e..b8fedf23b2 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -10,7 +10,6 @@ #include "table/sprites.h" #include "table/tree_land.h" #include "tile_cmd.h" -#include "map.h" #include "landscape.h" #include "tree_map.h" #include "viewport.h" diff --git a/src/tunnel_map.h b/src/tunnel_map.h index 1ddac57515..8cbd10a7d2 100644 --- a/src/tunnel_map.h +++ b/src/tunnel_map.h @@ -6,7 +6,6 @@ #define TUNNEL_MAP_H #include "direction_func.h" -#include "map.h" #include "rail_type.h" #include "road_type.h" #include "tile_map.h" diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 46bc47d9e6..86e0af2ad0 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -13,7 +13,6 @@ #include "table/sprites.h" #include "table/strings.h" #include "tile_cmd.h" -#include "map.h" #include "landscape.h" #include "tunnel_map.h" #include "unmovable_map.h" diff --git a/src/tunnelbridge_map.h b/src/tunnelbridge_map.h index b83e6e8d0f..b2beb57689 100644 --- a/src/tunnelbridge_map.h +++ b/src/tunnelbridge_map.h @@ -6,10 +6,9 @@ #define TUNNELBRIDGE_MAP_H #include "direction_func.h" -#include "core/bitmath_func.hpp" /* GB, HasBit, SB */ -#include "map.h" /* Tile, TileIndex */ -#include "tile_map.h" /* TileType, IsTileType */ -#include "openttd.h" /* TransportType */ +#include "core/bitmath_func.hpp" +#include "tile_map.h" +#include "openttd.h" /** diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp index f9992846d3..ef4638d231 100644 --- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -8,7 +8,6 @@ #include "table/sprites.h" #include "tile_cmd.h" #include "landscape.h" -#include "map.h" #include "command_func.h" #include "viewport.h" #include "player.h" diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 3eeeffc751..46e9fc5f62 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -12,7 +12,6 @@ #include "table/strings.h" #include "tile_cmd.h" #include "landscape.h" -#include "map.h" #include "vehicle.h" #include "timetable.h" #include "viewport.h" diff --git a/src/viewport.cpp b/src/viewport.cpp index 78b7f03a9b..983de1d44a 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -11,7 +11,6 @@ #include "table/sprites.h" #include "table/strings.h" #include "landscape.h" -#include "map.h" #include "viewport.h" #include "vehicle.h" #include "station.h" diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index c9f90a17db..c29dd003f1 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -12,7 +12,6 @@ #include "table/strings.h" #include "tile_cmd.h" #include "landscape.h" -#include "map.h" #include "vehicle.h" #include "viewport.h" #include "command_func.h" diff --git a/src/waypoint.cpp b/src/waypoint.cpp index f98489e8a7..224af027f7 100644 --- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -7,7 +7,6 @@ #include "command_func.h" #include "landscape.h" -#include "map.h" #include "order.h" #include "rail_map.h" #include "rail.h" diff --git a/src/window.cpp b/src/window.cpp index dc6a86364b..ef74e42f2d 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -6,7 +6,6 @@ #include #include "openttd.h" #include "debug.h" -#include "map.h" #include "player.h" #include "viewport.h" #include "console.h" @@ -17,6 +16,8 @@ #include "window_gui.h" #include "zoom_func.h" #include "core/alloc_func.hpp" +#include "vehicle.h" +#include "map_func.h" /* delta between mouse cursor and upper left corner of dragged window */ static Point _drag_delta; diff --git a/src/window_gui.h b/src/window_gui.h index 1b36117eab..316c76c936 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -10,7 +10,7 @@ #include "rail_type.h" #include "road_type.h" #include "airport.h" -#include "vehicle.h" +#include "vehicle_type.h" #include "viewport.h" /** diff --git a/src/yapf/track_dir.hpp b/src/yapf/track_dir.hpp index bb3de4488b..1f9c547d1a 100644 --- a/src/yapf/track_dir.hpp +++ b/src/yapf/track_dir.hpp @@ -3,9 +3,6 @@ #ifndef TRACK_DIR_HPP #define TRACK_DIR_HPP -#include "../tile_type.h" #include "../openttd.h" -#include "../map.h" -#include "../rail_type.h" #endif /* TRACK_DIR_HPP */