mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r20443) -Codechange: more TileHash to a more generic location
This commit is contained in:
parent
091f8ff731
commit
1dbd2223ad
|
@ -206,4 +206,35 @@ Slope GetTileSlope(TileIndex tile, uint *h);
|
||||||
uint GetTileZ(TileIndex tile);
|
uint GetTileZ(TileIndex tile);
|
||||||
uint GetTileMaxZ(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 */
|
||||||
|
|
30
src/town.h
30
src/town.h
|
@ -232,36 +232,6 @@ DECLARE_ENUM_AS_BIT_SET(TownActions)
|
||||||
extern const byte _town_action_costs[TACT_COUNT];
|
extern const byte _town_action_costs[TACT_COUNT];
|
||||||
extern TownID _new_town_id;
|
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
|
* Set the default name for a depot/waypoint
|
||||||
* @tparam T The type/class to make a default name for
|
* @tparam T The type/class to make a default name for
|
||||||
|
|
Loading…
Reference in New Issue