From f4d10ec033e7af54eedc9f19afccfff447e7c312 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 26 Dec 2008 22:44:13 +0000 Subject: (svn r14751) -Codechange: put VehicleEnterTile declaration where it should be and use correct return type --- src/tile_cmd.h | 1 + src/vehicle.cpp | 2 +- src/vehicle_func.h | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/tile_cmd.h b/src/tile_cmd.h index a3be7ea44..5baa3fa25 100644 --- a/src/tile_cmd.h +++ b/src/tile_cmd.h @@ -152,6 +152,7 @@ struct TileTypeProcs { extern const TileTypeProcs * const _tile_type_procs[16]; TrackStatus GetTileTrackStatus(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side = INVALID_DIAGDIR); +VehicleEnterTileStatus VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y); void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac); void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner); void AnimateTile(TileIndex tile); diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 6e1af2333..51166d6c0 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1862,7 +1862,7 @@ Trackdir GetVehicleTrackdir(const Vehicle *v) * @return Some meta-data over the to be entered tile. * @see VehicleEnterTileStatus to see what the bits in the return value mean. */ -uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y) +VehicleEnterTileStatus VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y) { return _tile_type_procs[GetTileType(tile)]->vehicle_enter_tile_proc(v, tile, x, y); } diff --git a/src/vehicle_func.h b/src/vehicle_func.h index 4b80ab1c1..ee2d2607a 100644 --- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -47,8 +47,6 @@ void ViewportAddVehicles(DrawPixelInfo *dpi); SpriteID GetRotorImage(const Vehicle *v); -uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y); - StringID VehicleInTheWayErrMsg(const Vehicle* v); bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile, const Vehicle *ignore = NULL); -- cgit v1.2.3-70-g09d2