From 6e67ea1f9dac718ec58d54b73883b0dd043bff2d Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 7 Sep 2008 11:23:10 +0000 Subject: (svn r14258) -Codechange: rework the way to query the vehicle hash to make sure it always results in the same irregardless of the order of the hash-linked-list. -Fix: desync in PBS reservation following, vehicle flooding and road vehicle overtake/follow code. --- src/vehicle_func.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/vehicle_func.h') diff --git a/src/vehicle_func.h b/src/vehicle_func.h index ce0c7407f..754004d59 100644 --- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -28,10 +28,11 @@ const Vehicle *GetLastVehicleInChain(const Vehicle *v); uint CountVehiclesInChain(const Vehicle *v); bool IsEngineCountable(const Vehicle *v); void DeleteVehicleChain(Vehicle *v); -Vehicle *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc); -Vehicle *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc); +void FindVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc); +void FindVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc); +bool HasVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc); +bool HasVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc); void CallVehicleTicks(); -Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z); uint8 CalcPercentVehicleFilled(const Vehicle *v, StringID *color); void InitializeTrains(); @@ -50,8 +51,7 @@ SpriteID GetRotorImage(const Vehicle *v); uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y); StringID VehicleInTheWayErrMsg(const Vehicle* v); -Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z, bool without_crashed = false); -Vehicle *GetVehicleTunnelBridge(TileIndex tile, TileIndex endtile); +bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile); void DecreaseVehicleValue(Vehicle *v); void CheckVehicleBreakdown(Vehicle *v); -- cgit v1.2.3-54-g00ecf