Mercurial > hg > openttd
changeset 4010:c7bb9484977e draft
(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)
| author | tron <tron@openttd.org> |
|---|---|
| date | Sat, 10 Jun 2006 21:06:29 +0000 |
| parents | 2da0cc7f3c10 |
| children | 3087808b106a |
| files | tile.h |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tile.h +++ b/tile.h @@ -59,11 +59,9 @@ 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); }