diff options
| author | rubidium <rubidium@openttd.org> | 2009-09-10 14:27:43 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-09-10 14:27:43 +0000 |
| commit | bb94724a092750794e8c2ad1a6537fac6b902b9e (patch) | |
| tree | 53e2fad2517d84d432e7f047445e888643e15c67 /src/town_map.h | |
| parent | 96e2435aa827b9e4af60b7c87fd8da38f9b87cc2 (diff) | |
| download | openttd-bb94724a092750794e8c2ad1a6537fac6b902b9e.tar.xz | |
(svn r17492) -Codechange: don't store the town index for road depots.
Diffstat (limited to 'src/town_map.h')
| -rw-r--r-- | src/town_map.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/town_map.h b/src/town_map.h index 3ac810cb4..2fd38b210 100644 --- a/src/town_map.h +++ b/src/town_map.h @@ -12,32 +12,31 @@ #ifndef TOWN_MAP_H #define TOWN_MAP_H -#include "tile_map.h" +#include "road_map.h" #include "town_type.h" #include "house.h" /** * Get the index of which town this house/street is attached to. * @param t the tile - * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) + * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) but not a road depot * @return TownID */ static inline TownID GetTownIndex(TileIndex t) { - assert(IsTileType(t, MP_HOUSE) || IsTileType(t, MP_ROAD)); // XXX incomplete + assert(IsTileType(t, MP_HOUSE) || (IsTileType(t, MP_ROAD) && !IsRoadDepot(t))); return _m[t].m2; } /** * Set the town index for a road or house tile. * @param t the tile - * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) * @param index the index of the town - * @pre IsTileType(t, MP_ROAD) || IsTileType(t, MP_HOUSE) + * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) but not a road depot */ static inline void SetTownIndex(TileIndex t, TownID index) { - assert(IsTileType(t, MP_HOUSE) || IsTileType(t, MP_ROAD)); + assert(IsTileType(t, MP_HOUSE) || (IsTileType(t, MP_ROAD) && !IsRoadDepot(t))); _m[t].m2 = index; } |