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

Remove some assertions on tile accessors in non-debug builds

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-01-19 04:28:06 +00:00
parent 7c539267ed
commit f763b5d5e0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tile_map.h
View File

@@ -30,7 +30,10 @@
*/ */
static inline uint TileHeight(TileIndex tile) static inline uint TileHeight(TileIndex tile)
{ {
/* this method is inlined in many places and is performance-critical, drop assertion in non-debug builds */
#ifdef _DEBUG
assert_msg(tile < MapSize(), "tile: 0x%X, size: 0x%X", tile, MapSize()); assert_msg(tile < MapSize(), "tile: 0x%X, size: 0x%X", tile, MapSize());
#endif
return _m[tile].height; return _m[tile].height;
} }
@@ -88,7 +91,10 @@ static inline uint TilePixelHeightOutsideMap(int x, int y)
*/ */
static inline TileType GetTileType(TileIndex tile) static inline TileType GetTileType(TileIndex tile)
{ {
/* this method is inlined in many places and is performance-critical, drop assertion in non-debug builds */
#ifdef _DEBUG
assert_msg(tile < MapSize(), "tile: 0x%X, size: 0x%X", tile, MapSize()); assert_msg(tile < MapSize(), "tile: 0x%X, size: 0x%X", tile, MapSize());
#endif
return (TileType)GB(_m[tile].type, 4, 4); return (TileType)GB(_m[tile].type, 4, 4);
} }