mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
This commit is contained in:
parent
aac835171e
commit
2786d789a1
|
@ -6,7 +6,6 @@
|
||||||
#include "../../bridge_map.h"
|
#include "../../bridge_map.h"
|
||||||
#include "../../tile_cmd.h"
|
#include "../../tile_cmd.h"
|
||||||
#include "../../landscape.h"
|
#include "../../landscape.h"
|
||||||
#include "../../map.h"
|
|
||||||
#include "../../rail_map.h"
|
#include "../../rail_map.h"
|
||||||
#include "../../road_map.h"
|
#include "../../road_map.h"
|
||||||
#include "../../roadveh.h"
|
#include "../../roadveh.h"
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include "../../stdafx.h"
|
#include "../../stdafx.h"
|
||||||
#include "../../openttd.h"
|
#include "../../openttd.h"
|
||||||
#include "../../debug.h"
|
#include "../../debug.h"
|
||||||
#include "../../map.h"
|
|
||||||
#include "../../road_map.h"
|
#include "../../road_map.h"
|
||||||
#include "../../vehicle.h"
|
#include "../../vehicle.h"
|
||||||
#include "../../command_func.h"
|
#include "../../command_func.h"
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include "../../openttd.h"
|
#include "../../openttd.h"
|
||||||
#include "../../bridge_map.h"
|
#include "../../bridge_map.h"
|
||||||
#include "../../debug.h"
|
#include "../../debug.h"
|
||||||
#include "../../map.h"
|
|
||||||
#include "../../command_func.h"
|
#include "../../command_func.h"
|
||||||
#include "trolly.h"
|
#include "trolly.h"
|
||||||
#include "../../depot.h"
|
#include "../../depot.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "../../stdafx.h"
|
#include "../../stdafx.h"
|
||||||
#include "../../openttd.h"
|
#include "../../openttd.h"
|
||||||
#include "../../debug.h"
|
#include "../../debug.h"
|
||||||
#include "../../map.h"
|
#include "../../map_func.h"
|
||||||
#include "trolly.h"
|
#include "trolly.h"
|
||||||
#include "../../vehicle.h"
|
#include "../../vehicle.h"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#include "../../road_map.h"
|
#include "../../road_map.h"
|
||||||
#include "../../station_map.h"
|
#include "../../station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "../../map.h"
|
|
||||||
#include "../../command_func.h"
|
#include "../../command_func.h"
|
||||||
#include "trolly.h"
|
#include "trolly.h"
|
||||||
#include "../../town.h"
|
#include "../../town.h"
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "timetable.h"
|
#include "timetable.h"
|
||||||
#include "depot.h"
|
#include "depot.h"
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "map.h"
|
|
||||||
#include "airport.h"
|
#include "airport.h"
|
||||||
#include "variables.h"
|
#include "variables.h"
|
||||||
#include "airport_movement.h"
|
#include "airport_movement.h"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#define AIRPORT_H
|
#define AIRPORT_H
|
||||||
|
|
||||||
#include "direction_type.h"
|
#include "direction_type.h"
|
||||||
#include "map.h"
|
#include "map_type.h"
|
||||||
|
|
||||||
enum {MAX_TERMINALS = 10};
|
enum {MAX_TERMINALS = 10};
|
||||||
enum {MAX_HELIPADS = 4};
|
enum {MAX_HELIPADS = 4};
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "station_gui.h"
|
#include "station_gui.h"
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
@ -16,6 +15,7 @@
|
||||||
#include "bridge.h"
|
#include "bridge.h"
|
||||||
#include "strings_func.h"
|
#include "strings_func.h"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
static struct BridgeData {
|
static struct BridgeData {
|
||||||
uint8 last_size;
|
uint8 last_size;
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#define BRIDGE_MAP_H
|
#define BRIDGE_MAP_H
|
||||||
|
|
||||||
#include "direction_func.h"
|
#include "direction_func.h"
|
||||||
#include "map.h"
|
|
||||||
#include "rail_type.h"
|
#include "rail_type.h"
|
||||||
#include "road_map.h"
|
#include "road_map.h"
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include "clear_map.h"
|
#include "clear_map.h"
|
||||||
#include "rail_map.h"
|
#include "rail_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "tile_map.h"
|
#include "tile_map.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
// ** scriptfile handling ** //
|
// ** scriptfile handling ** //
|
||||||
static FILE *_script_file;
|
static FILE *_script_file;
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "depot.h"
|
#include "depot.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "saveload.h"
|
#include "saveload.h"
|
||||||
#include "order.h"
|
#include "order.h"
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#include "industry_map.h"
|
#include "industry_map.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "tile_map.h"
|
#include "tile_map.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
|
@ -18,6 +17,7 @@
|
||||||
#include "variables.h"
|
#include "variables.h"
|
||||||
#include "water.h"
|
#include "water.h"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
|
#include "vehicle.h"
|
||||||
|
|
||||||
static void ShowBuildDockStationPicker();
|
static void ShowBuildDockStationPicker();
|
||||||
static void ShowBuildDocksDepotPicker();
|
static void ShowBuildDocksDepotPicker();
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "news.h"
|
#include "news.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
|
|
|
@ -123,7 +123,7 @@ struct Engine {
|
||||||
PlayerByte preview_player;
|
PlayerByte preview_player;
|
||||||
byte preview_wait;
|
byte preview_wait;
|
||||||
byte player_avail;
|
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.
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "command_type.h"
|
#include "command_type.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "map.h"
|
|
||||||
|
|
||||||
/* clear_land.cpp */
|
/* clear_land.cpp */
|
||||||
void DrawHillyLandTile(const TileInfo *ti);
|
void DrawHillyLandTile(const TileInfo *ti);
|
||||||
|
@ -24,10 +23,6 @@ void SubtractMoneyFromPlayerFract(PlayerID player, CommandCost cost);
|
||||||
bool CheckOwnership(Owner owner);
|
bool CheckOwnership(Owner owner);
|
||||||
bool CheckTileOwnership(TileIndex tile);
|
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 */
|
/* texteff.cpp */
|
||||||
void AddAnimatedTile(TileIndex tile);
|
void AddAnimatedTile(TileIndex tile);
|
||||||
void DeleteAnimatedTile(TileIndex tile);
|
void DeleteAnimatedTile(TileIndex tile);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "heightmap.h"
|
#include "heightmap.h"
|
||||||
#include "date.h"
|
#include "date.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "map.h"
|
#include "map_func.h"
|
||||||
|
|
||||||
void GenerateClearTile();
|
void GenerateClearTile();
|
||||||
void GenerateIndustries();
|
void GenerateIndustries();
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "newgrf_storage.h"
|
#include "newgrf_storage.h"
|
||||||
#include "cargo_type.h"
|
#include "cargo_type.h"
|
||||||
#include "economy_type.h"
|
#include "economy_type.h"
|
||||||
#include "map.h"
|
#include "map_type.h"
|
||||||
#include "slope_type.h"
|
#include "slope_type.h"
|
||||||
|
|
||||||
typedef uint16 IndustryGfx;
|
typedef uint16 IndustryGfx;
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "train.h"
|
#include "train.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "textbuf_gui.h"
|
#include "textbuf_gui.h"
|
||||||
|
@ -23,6 +22,7 @@
|
||||||
#include "newgrf_text.h"
|
#include "newgrf_text.h"
|
||||||
#include "date.h"
|
#include "date.h"
|
||||||
#include "strings_func.h"
|
#include "strings_func.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
bool _ignore_restrictions;
|
bool _ignore_restrictions;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "heightmap.h"
|
#include "heightmap.h"
|
||||||
#include "clear_map.h"
|
#include "clear_map.h"
|
||||||
#include "date.h"
|
#include "date.h"
|
||||||
#include "map.h"
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "spritecache.h"
|
#include "spritecache.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
|
|
|
@ -3,13 +3,12 @@
|
||||||
/** @file map.cpp */
|
/** @file map.cpp */
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "map.h"
|
|
||||||
#include "direction_func.h"
|
#include "direction_func.h"
|
||||||
#include "core/bitmath_func.hpp"
|
#include "core/bitmath_func.hpp"
|
||||||
#include "core/alloc_func.hpp"
|
#include "core/alloc_func.hpp"
|
||||||
#include "core/math_func.hpp"
|
#include "core/math_func.hpp"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* VStudio 2005 is stupid! */
|
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* VStudio 2005 is stupid! */
|
||||||
/* Why the hell is that not in all MSVC headers?? */
|
/* Why the hell is that not in all MSVC headers?? */
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
/** @file map.h */
|
/** @file map.h */
|
||||||
|
|
||||||
#ifndef MAP_H
|
#ifndef MAP_FUNC_H
|
||||||
#define MAP_H
|
#define MAP_FUNC_H
|
||||||
|
|
||||||
#include "stdafx.h"
|
|
||||||
#include "direction_func.h"
|
|
||||||
#include "tile_type.h"
|
#include "tile_type.h"
|
||||||
|
#include "map_type.h"
|
||||||
|
#include "direction_func.h"
|
||||||
|
|
||||||
extern uint _map_tile_mask;
|
extern uint _map_tile_mask;
|
||||||
|
|
||||||
|
@ -24,28 +24,6 @@ extern uint _map_tile_mask;
|
||||||
*/
|
*/
|
||||||
#define TILE_ASSERT(x) assert(TILE_MASK(x) == (x));
|
#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.
|
* Pointer to the tile-array.
|
||||||
*
|
*
|
||||||
|
@ -206,17 +184,6 @@ static inline uint TileY(TileIndex tile)
|
||||||
return tile >> MapLogX();
|
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.
|
* Return the offset between to tiles from a TileIndexDiffC struct.
|
||||||
*
|
*
|
||||||
|
@ -234,13 +201,13 @@ static inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
|
||||||
|
|
||||||
|
|
||||||
#ifndef _DEBUG
|
#ifndef _DEBUG
|
||||||
/**
|
/**
|
||||||
* Adds to tiles together.
|
* Adds to tiles together.
|
||||||
*
|
*
|
||||||
* @param x One tile
|
* @param x One tile
|
||||||
* @param y An other tile to add
|
* @param y An other tile to add
|
||||||
* @return The resulting tile(index)
|
* @return The resulting tile(index)
|
||||||
*/
|
*/
|
||||||
#define TILE_ADD(x,y) ((x) + (y))
|
#define TILE_ADD(x,y) ((x) + (y))
|
||||||
#else
|
#else
|
||||||
extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
|
extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
|
||||||
|
@ -275,6 +242,7 @@ static inline TileIndexDiffC TileIndexDiffCByDiagDir(DiagDirection dir)
|
||||||
assert(IsValidDiagDirection(dir));
|
assert(IsValidDiagDirection(dir));
|
||||||
return _tileoffs_by_diagdir[dir];
|
return _tileoffs_by_diagdir[dir];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a TileIndexDiffC to a TileIndex and returns the new one.
|
* 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);
|
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).
|
* Get a random tile out of a given seed.
|
||||||
*
|
* @param r the random 'seed'
|
||||||
* #defined instead of const so it can
|
* @return a valid tile
|
||||||
* stay integer. (no runtime float operations) Is this needed?
|
*/
|
||||||
* Watch out! There are _no_ brackets around here, to prevent intermediate
|
static inline TileIndex RandomTileSeed(uint32 r)
|
||||||
* rounding! Be careful when using this!
|
{
|
||||||
* This value should be sqrt(2)/2 ~ 0.7071 */
|
return TILE_MASK(r);
|
||||||
#define STRAIGHT_TRACK_LENGTH 7071/10000
|
}
|
||||||
|
|
||||||
#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 */
|
|
@ -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 */
|
|
@ -11,7 +11,6 @@
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "saveload.h"
|
#include "saveload.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
@ -26,6 +25,7 @@
|
||||||
#include "economy_func.h"
|
#include "economy_func.h"
|
||||||
#include "zoom_func.h"
|
#include "zoom_func.h"
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
char _name_array[512][32];
|
char _name_array[512][32];
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/tree_land.h"
|
#include "table/tree_land.h"
|
||||||
#include "map.h"
|
|
||||||
#include "tile_map.h"
|
#include "tile_map.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
|
|
|
@ -11,7 +11,7 @@ extern const char _openttd_revision[];
|
||||||
#include "../debug.h"
|
#include "../debug.h"
|
||||||
#include "../string.h"
|
#include "../string.h"
|
||||||
#include "../strings_func.h"
|
#include "../strings_func.h"
|
||||||
#include "../map.h"
|
#include "../map_func.h"
|
||||||
#include "../command_func.h"
|
#include "../command_func.h"
|
||||||
#include "../variables.h"
|
#include "../variables.h"
|
||||||
#include "../date.h"
|
#include "../date.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include "../string.h"
|
#include "../string.h"
|
||||||
#include "network_data.h"
|
#include "network_data.h"
|
||||||
#include "../date.h"
|
#include "../date.h"
|
||||||
#include "../map.h"
|
#include "../map_func.h"
|
||||||
#include "network_gamelist.h"
|
#include "network_gamelist.h"
|
||||||
#include "network_udp.h"
|
#include "network_udp.h"
|
||||||
#include "../variables.h"
|
#include "../variables.h"
|
||||||
|
|
|
@ -4,12 +4,13 @@
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
|
#include "npf.h"
|
||||||
|
#include "vehicle.h"
|
||||||
#include "bridge_map.h"
|
#include "bridge_map.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "bridge.h"
|
#include "bridge.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "npf.h"
|
|
||||||
#include "aystar.h"
|
#include "aystar.h"
|
||||||
#include "pathfind.h"
|
#include "pathfind.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
|
|
|
@ -8,8 +8,9 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "aystar.h"
|
#include "aystar.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle_type.h"
|
||||||
#include "tile_type.h"
|
#include "tile_type.h"
|
||||||
|
#include "track_type.h"
|
||||||
|
|
||||||
/* mowing grass */
|
/* mowing grass */
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "town.h"
|
#include "town.h"
|
||||||
#include "industry.h"
|
#include "industry.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "driver.h"
|
#include "driver.h"
|
||||||
#include "saveload.h"
|
#include "saveload.h"
|
||||||
#include "map.h"
|
|
||||||
|
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "depot.h"
|
#include "depot.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "pathfind.h"
|
#include "pathfind.h"
|
||||||
#include "rail_type.h"
|
#include "rail_type.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "town.h"
|
#include "town.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include "road_map.h"
|
#include "road_map.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "town_map.h"
|
#include "town_map.h"
|
||||||
#include "tunnel_map.h"
|
#include "tunnel_map.h"
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "date.h"
|
#include "date.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "station_gui.h"
|
#include "station_gui.h"
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "map.h"
|
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "town_map.h"
|
#include "town_map.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "station_gui.h"
|
#include "station_gui.h"
|
||||||
|
@ -17,6 +16,7 @@
|
||||||
#include "road_cmd.h"
|
#include "road_cmd.h"
|
||||||
#include "road_map.h"
|
#include "road_map.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
|
#include "vehicle.h"
|
||||||
//needed for catchments
|
//needed for catchments
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "roadveh.h"
|
#include "roadveh.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "timetable.h"
|
#include "timetable.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "zoom_func.h"
|
#include "zoom_func.h"
|
||||||
#include "core/alloc_func.hpp"
|
#include "core/alloc_func.hpp"
|
||||||
#include "core/endian_func.hpp"
|
#include "core/endian_func.hpp"
|
||||||
#include "map.h"
|
#include "map_func.h"
|
||||||
|
|
||||||
char _screenshot_format_name[8];
|
char _screenshot_format_name[8];
|
||||||
uint _num_screenshot_formats;
|
uint _num_screenshot_formats;
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "timetable.h"
|
#include "timetable.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "zoom_func.h"
|
#include "zoom_func.h"
|
||||||
#include "functions.h"
|
#include "functions.h"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
SignID _new_sign_id;
|
SignID _new_sign_id;
|
||||||
uint _total_signs;
|
uint _total_signs;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "strings_func.h"
|
#include "strings_func.h"
|
||||||
#include "core/alloc_func.hpp"
|
#include "core/alloc_func.hpp"
|
||||||
#include "window_func.h"
|
#include "window_func.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
static const Sign **_sign_sort;
|
static const Sign **_sign_sort;
|
||||||
static uint _num_sign_sort;
|
static uint _num_sign_sort;
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "tree_map.h"
|
#include "tree_map.h"
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "mixer.h"
|
#include "mixer.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
@ -15,6 +14,7 @@
|
||||||
#include "fios.h"
|
#include "fios.h"
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "core/alloc_func.hpp"
|
#include "core/alloc_func.hpp"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
static uint _file_count;
|
static uint _file_count;
|
||||||
static FileEntry *_files;
|
static FileEntry *_files;
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "town.h"
|
#include "town.h"
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "clear_map.h"
|
#include "clear_map.h"
|
||||||
#include "map.h"
|
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "clear_map.h"
|
#include "clear_map.h"
|
||||||
#include "variables.h"
|
#include "variables.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#include "tile_type.h"
|
#include "tile_type.h"
|
||||||
#include "slope_type.h"
|
#include "slope_type.h"
|
||||||
#include "map.h"
|
#include "map_func.h"
|
||||||
#include "core/bitmath_func.hpp"
|
#include "core/bitmath_func.hpp"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#include "road_internal.h" /* Cleaning up road bits */
|
#include "road_internal.h" /* Cleaning up road bits */
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "map.h"
|
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "town_map.h"
|
#include "town_map.h"
|
||||||
#include "tunnel_map.h"
|
#include "tunnel_map.h"
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "station_map.h"
|
#include "station_map.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "map.h"
|
|
||||||
#include "tunnel_map.h"
|
#include "tunnel_map.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "timetable.h"
|
#include "timetable.h"
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/tree_land.h"
|
#include "table/tree_land.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "map.h"
|
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "tree_map.h"
|
#include "tree_map.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#define TUNNEL_MAP_H
|
#define TUNNEL_MAP_H
|
||||||
|
|
||||||
#include "direction_func.h"
|
#include "direction_func.h"
|
||||||
#include "map.h"
|
|
||||||
#include "rail_type.h"
|
#include "rail_type.h"
|
||||||
#include "road_type.h"
|
#include "road_type.h"
|
||||||
#include "tile_map.h"
|
#include "tile_map.h"
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "map.h"
|
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "tunnel_map.h"
|
#include "tunnel_map.h"
|
||||||
#include "unmovable_map.h"
|
#include "unmovable_map.h"
|
||||||
|
|
|
@ -6,10 +6,9 @@
|
||||||
#define TUNNELBRIDGE_MAP_H
|
#define TUNNELBRIDGE_MAP_H
|
||||||
|
|
||||||
#include "direction_func.h"
|
#include "direction_func.h"
|
||||||
#include "core/bitmath_func.hpp" /* GB, HasBit, SB */
|
#include "core/bitmath_func.hpp"
|
||||||
#include "map.h" /* Tile, TileIndex */
|
#include "tile_map.h"
|
||||||
#include "tile_map.h" /* TileType, IsTileType */
|
#include "openttd.h"
|
||||||
#include "openttd.h" /* TransportType */
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "timetable.h"
|
#include "timetable.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "table/sprites.h"
|
#include "table/sprites.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "station.h"
|
#include "station.h"
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "tile_cmd.h"
|
#include "tile_cmd.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
#include "command_func.h"
|
#include "command_func.h"
|
||||||
#include "landscape.h"
|
#include "landscape.h"
|
||||||
#include "map.h"
|
|
||||||
#include "order.h"
|
#include "order.h"
|
||||||
#include "rail_map.h"
|
#include "rail_map.h"
|
||||||
#include "rail.h"
|
#include "rail.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "openttd.h"
|
#include "openttd.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "map.h"
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
|
@ -17,6 +16,8 @@
|
||||||
#include "window_gui.h"
|
#include "window_gui.h"
|
||||||
#include "zoom_func.h"
|
#include "zoom_func.h"
|
||||||
#include "core/alloc_func.hpp"
|
#include "core/alloc_func.hpp"
|
||||||
|
#include "vehicle.h"
|
||||||
|
#include "map_func.h"
|
||||||
|
|
||||||
/* delta between mouse cursor and upper left corner of dragged window */
|
/* delta between mouse cursor and upper left corner of dragged window */
|
||||||
static Point _drag_delta;
|
static Point _drag_delta;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "rail_type.h"
|
#include "rail_type.h"
|
||||||
#include "road_type.h"
|
#include "road_type.h"
|
||||||
#include "airport.h"
|
#include "airport.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle_type.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
#ifndef TRACK_DIR_HPP
|
#ifndef TRACK_DIR_HPP
|
||||||
#define TRACK_DIR_HPP
|
#define TRACK_DIR_HPP
|
||||||
|
|
||||||
#include "../tile_type.h"
|
|
||||||
#include "../openttd.h"
|
#include "../openttd.h"
|
||||||
#include "../map.h"
|
|
||||||
#include "../rail_type.h"
|
|
||||||
|
|
||||||
#endif /* TRACK_DIR_HPP */
|
#endif /* TRACK_DIR_HPP */
|
||||||
|
|
Loading…
Reference in New Issue