diff options
| author | tron <tron@openttd.org> | 2005-01-29 15:12:40 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-01-29 15:12:40 +0000 |
| commit | 97ae59fe1a0248b95dbfff27f84cfeb87742f050 (patch) | |
| tree | e38584a427c9b3f39a3b8dc39ada303239edb4fa /smallmap_gui.c | |
| parent | 797355cb7ea1e4e33b20a64bdb3de6b1a492eeab (diff) | |
| download | openttd-97ae59fe1a0248b95dbfff27f84cfeb87742f050.tar.xz | |
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
This makes it necessary to rename TileType() to GetTileType() because a type and a function may not share the same name.
Diffstat (limited to 'smallmap_gui.c')
| -rw-r--r-- | smallmap_gui.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/smallmap_gui.c b/smallmap_gui.c index eed9a9c6a..ac9fce8a9 100644 --- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -298,7 +298,7 @@ static inline uint32 GetSmallMapCountoursPixels(uint tile) { uint t; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_TUNNELBRIDGE) { t = _map5[tile]; if ((t & 0x80) == 0) t>>=1; @@ -328,7 +328,7 @@ static inline uint32 GetSmallMapVehiclesPixels(uint tile) { uint t; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_TUNNELBRIDGE) { t = _map5[tile]; if ((t & 0x80) == 0) t>>=1; @@ -381,7 +381,7 @@ static inline uint32 GetSmallMapIndustriesPixels(uint tile) { int t; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_INDUSTRY) { byte color = _industry_smallmap_colors[_map5[tile]]; return color + (color << 8) + (color << 16) + (color << 24); @@ -414,7 +414,7 @@ static inline uint32 GetSmallMapRoutesPixels(uint tile) int t; uint32 bits; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_STATION) { byte m5 = _map5[tile]; (bits = MKCOLOR(0x56565656), m5 < 8) || // 8 - railroad station (green) @@ -470,7 +470,7 @@ static inline uint32 GetSmallMapVegetationPixels(uint tile) int i,t; uint32 bits; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_CLEAR) { i = (_map5[tile] & 0x1F) - 4; if (i >= 0) i = (i >> 2); @@ -515,7 +515,7 @@ static inline uint32 GetSmallMapOwnerPixels(uint tile) { int t; - t = TileType(tile); + t = GetTileType(tile); if (t == MP_HOUSE || _map_owner[tile] == OWNER_TOWN) { t = 0x80; } else if (t == MP_INDUSTRY) { |