From 4ba334ffde9b3cd0e6647475fc2e6806c99a5ff9 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 10 Jun 2006 21:06:29 +0000 Subject: [PATCH] (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) --- tile.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tile.h b/tile.h index e23fc03f09..c2c0f0168f 100644 --- a/tile.h +++ b/tile.h @@ -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); }