mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r5221) Make the assertion in SetTileType() more strict: "lower edge of map <=> VOID" instead of just "lower edge of map => VOID" 

This works since the hack abusing SetTileType() in openttd.c is gone (r5171)
This commit is contained in:
tron 2006-06-10 21:06:29 +00:00
parent 7d0a139828
commit 4ba334ffde
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tile.h
View File

@ -59,11 +59,9 @@ static inline TileType GetTileType(TileIndex tile)
static inline void SetTileType(TileIndex tile, TileType type)
{
assert(tile < MapSize());
/* Allow only MP_VOID to be set to border tiles. This code is put here since
* it seems there is a bug that violates this somewhere. (Formely know as
* the "old ship pf" bug, which presented a case in which this broke). It
* can be removed as soon as the bug is squashed. */
assert((TileX(tile) < MapMaxX() && TileY(tile) < MapMaxY()) || type == MP_VOID);
/* VOID tiles (and no others) are exactly allowed at the lower left and right
*edges of the map */
assert((TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) == (type == MP_VOID));
SB(_m[tile].type_height, 4, 4, type);
}