dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: move TILE_MASK to Map::WrapToMap

Browse Source
This commit is contained in:
Rubidium
2023-01-21 11:05:19 +01:00
committed by rubidium42
parent fe2bcd2a58
commit de6bc8e692
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/map_func.h
View File

@@ -15,16 +15,6 @@
#include "map_type.h"
#include "direction_func.h"
extern uint _map_tile_mask;
/**
* 'Wraps' the given tile to it is within the map. It does
* this by masking the 'high' bits of.
* @param x the tile to 'wrap'
*/
#define TILE_MASK(x) ((x) & _map_tile_mask)
/**
* Pointer to the tile-array.
*
@@ -117,6 +107,18 @@ struct Map {
return Map::SizeY() - 1;
}
/**
* 'Wraps' the given "tile" so it is within the map.
* It does this by masking the 'high' bits of.
* @param tile the tile to 'wrap'
*/
static inline TileIndex WrapToMap(uint tile)
{
extern uint _map_tile_mask;
return tile & _map_tile_mask;
}
/**
* Scales the given value by the map size, where the given value is
* for a 256 by 256 map.
@@ -429,7 +431,7 @@ bool CircularTileSearch(TileIndex *tile, uint radius, uint w, uint h, TestTileOn
*/
static inline TileIndex RandomTileSeed(uint32 r)
{
return TILE_MASK(r);
return Map::WrapToMap(r);
}
/**