mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r14751) -Codechange: put VehicleEnterTile declaration where it should be and use correct return type
This commit is contained in:
parent
21fa036c21
commit
f4d10ec033
|
@ -152,6 +152,7 @@ struct TileTypeProcs {
|
||||||
extern const TileTypeProcs * const _tile_type_procs[16];
|
extern const TileTypeProcs * const _tile_type_procs[16];
|
||||||
|
|
||||||
TrackStatus GetTileTrackStatus(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side = INVALID_DIAGDIR);
|
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 GetAcceptedCargo(TileIndex tile, AcceptedCargo ac);
|
||||||
void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner);
|
void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner);
|
||||||
void AnimateTile(TileIndex tile);
|
void AnimateTile(TileIndex tile);
|
||||||
|
|
|
@ -1862,7 +1862,7 @@ Trackdir GetVehicleTrackdir(const Vehicle *v)
|
||||||
* @return Some meta-data over the to be entered tile.
|
* @return Some meta-data over the to be entered tile.
|
||||||
* @see VehicleEnterTileStatus to see what the bits in the return value mean.
|
* @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);
|
return _tile_type_procs[GetTileType(tile)]->vehicle_enter_tile_proc(v, tile, x, y);
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,6 @@ void ViewportAddVehicles(DrawPixelInfo *dpi);
|
||||||
|
|
||||||
SpriteID GetRotorImage(const Vehicle *v);
|
SpriteID GetRotorImage(const Vehicle *v);
|
||||||
|
|
||||||
uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);
|
|
||||||
|
|
||||||
StringID VehicleInTheWayErrMsg(const Vehicle* v);
|
StringID VehicleInTheWayErrMsg(const Vehicle* v);
|
||||||
bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile, const Vehicle *ignore = NULL);
|
bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile, const Vehicle *ignore = NULL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue