From 2b6978e48e0f043309e8b096dd66fad50f212d53 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 1 Aug 2008 15:07:31 +0000 Subject: (svn r13912) -Codechange: remove some casts by returning the proper type instead of void*. --- src/vehicle_func.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/vehicle_func.h') diff --git a/src/vehicle_func.h b/src/vehicle_func.h index 61c941548..89862b8e7 100644 --- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -19,7 +19,7 @@ #define IS_CUSTOM_FIRSTHEAD_SPRITE(x) (x == 0xFD) #define IS_CUSTOM_SECONDHEAD_SPRITE(x) (x == 0xFE) -typedef void *VehicleFromPosProc(Vehicle *v, void *data); +typedef Vehicle *VehicleFromPosProc(Vehicle *v, void *data); void VehicleServiceInDepot(Vehicle *v); void VehiclePositionChanged(Vehicle *v); @@ -28,8 +28,8 @@ const Vehicle *GetLastVehicleInChain(const Vehicle *v); uint CountVehiclesInChain(const Vehicle *v); bool IsEngineCountable(const Vehicle *v); void DeleteVehicleChain(Vehicle *v); -void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc); -void *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc); +Vehicle *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc); +Vehicle *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc); void CallVehicleTicks(); Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z); uint8 CalcPercentVehicleFilled(const Vehicle *v, StringID *color); -- cgit v1.2.3-54-g00ecf