diff options
| -rw-r--r-- | landscape.c | 7 | ||||
| -rw-r--r-- | openttd.c | 7 | ||||
| -rw-r--r-- | void.h | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/landscape.c b/landscape.c index af0b8cb9b..b96c98491 100644 --- a/landscape.c +++ b/landscape.c @@ -14,6 +14,7 @@ #include "command.h" #include "vehicle.h" #include "variables.h" +#include "void.h" extern const TileTypeProcs _tile_type_clear_procs, @@ -447,10 +448,8 @@ void InitializeLandscape(void) } // create void tiles at the border - for (i = 0; i < MapMaxY(); ++i) - SetTileType(i * MapSizeX() + MapMaxX(), MP_VOID); - for (i = 0; i < MapSizeX(); ++i) - SetTileType(MapSizeX() * MapMaxY() + i, MP_VOID); + for (i = 0; i < MapMaxY(); ++i) MakeVoid(i * MapSizeX() + MapMaxX()); + for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i); } void ConvertGroundTilesIntoWaterTiles(void) @@ -9,6 +9,7 @@ #include "strings.h" #include "map.h" #include "tile.h" +#include "void.h" #define VARDEF #include "openttd.h" @@ -1059,10 +1060,8 @@ static void UpdateVoidTiles(void) { uint i; - for (i = 0; i < MapMaxY(); ++i) - SetTileType(i * MapSizeX() + MapMaxX(), MP_VOID); - for (i = 0; i < MapSizeX(); ++i) - SetTileType(MapSizeX() * MapMaxY() + i, MP_VOID); + for (i = 0; i < MapMaxY(); ++i) MakeVoid(i * MapSizeX() + MapMaxX()); + for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i); } // since savegame version 6.0 each sign has an "owner", signs without owner (from old games are set to 255) @@ -0,0 +1,6 @@ +/* $Id$ */ + +static inline void MakeVoid(TileIndex t) +{ + SetTileType(t, MP_VOID); +} |