diff options
| -rw-r--r-- | src/tile_map.h | 33 | ||||
| -rw-r--r-- | src/town.h | 30 |
2 files changed, 32 insertions, 31 deletions
diff --git a/src/tile_map.h b/src/tile_map.h index 393b89e01..202ad04e9 100644 --- a/src/tile_map.h +++ b/src/tile_map.h @@ -206,4 +206,35 @@ Slope GetTileSlope(TileIndex tile, uint *h); uint GetTileZ(TileIndex tile); uint GetTileMaxZ(TileIndex tile); -#endif /* TILE_TYPE_H */ + +/** + * Calculate a hash value from a tile position + * + * @param x The X coordinate + * @param y The Y coordinate + * @return The hash of the tile + */ +static inline uint TileHash(uint x, uint y) +{ + uint hash = x >> 4; + hash ^= x >> 6; + hash ^= y >> 4; + hash -= y >> 6; + return hash; +} + +/** + * Get the last two bits of the TileHash + * from a tile position. + * + * @see TileHash() + * @param x The X coordinate + * @param y The Y coordinate + * @return The last two bits from hash of the tile + */ +static inline uint TileHash2Bit(uint x, uint y) +{ + return GB(TileHash(x, y), 0, 2); +} + +#endif /* TILE_MAP_H */ diff --git a/src/town.h b/src/town.h index c5f8eb35c..6e3533d8d 100644 --- a/src/town.h +++ b/src/town.h @@ -233,36 +233,6 @@ extern const byte _town_action_costs[TACT_COUNT]; extern TownID _new_town_id; /** - * Calculate a hash value from a tile position - * - * @param x The X coordinate - * @param y The Y coordinate - * @return The hash of the tile - */ -static inline uint TileHash(uint x, uint y) -{ - uint hash = x >> 4; - hash ^= x >> 6; - hash ^= y >> 4; - hash -= y >> 6; - return hash; -} - -/** - * Get the last two bits of the TileHash - * from a tile position. - * - * @see TileHash() - * @param x The X coordinate - * @param y The Y coordinate - * @return The last two bits from hash of the tile - */ -static inline uint TileHash2Bit(uint x, uint y) -{ - return GB(TileHash(x, y), 0, 2); -} - -/** * Set the default name for a depot/waypoint * @tparam T The type/class to make a default name for * @param obj The object/instance we want to find the name for |