petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.

Browse Source 
This makes it necessary to rename TileType() to GetTileType() because a type and a function may not share the same name.
This commit is contained in:
tron
2005-01-29 15:12:40 +00:00
parent 797355cb7e
commit 97ae59fe1a
12 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vehicle.c
View File

@@ -1733,13 +1733,13 @@ byte GetDirectionTowards(Vehicle *v, int x, int y)
uint32 VehicleEnterTile(Vehicle *v, uint tile, int x, int y)
{
uint old_tile = v->tile;
uint32 result = _tile_type_procs[TileType(tile)]->vehicle_enter_tile_proc(v, tile, x, y);
uint32 result = _tile_type_procs[GetTileType(tile)]->vehicle_enter_tile_proc(v, tile, x, y);
/* When vehicle_enter_tile_proc returns 8, that apparently means that
* we cannot enter the tile at all. In that case, don't call
* leave_tile. */
if (!(result & 8) && old_tile != tile) {
VehicleLeaveTileProc *proc = _tile_type_procs[TileType(old_tile)]->vehicle_leave_tile_proc;
VehicleLeaveTileProc *proc = _tile_type_procs[GetTileType(old_tile)]->vehicle_leave_tile_proc;
if (proc != NULL)
proc(v, old_tile, x, y);
}