From 0c10006907b7d149f91d277a0c28a79b40eaa4c0 Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 6 Jun 2009 16:54:22 +0000 Subject: (svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check --- src/disaster_cmd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/disaster_cmd.cpp') diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index a32ee6b80..bee1db1a7 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -313,9 +313,8 @@ static bool DisasterTick_Ufo(DisasterVehicle *v) return false; } else { /* Target a vehicle */ - Vehicle *u_tmp = Vehicle::Get(v->dest_tile); - assert(u_tmp != NULL && u_tmp->type == VEH_ROAD && IsRoadVehFront(u_tmp)); - RoadVehicle *u = (RoadVehicle *)u_tmp; + RoadVehicle *u = RoadVehicle::Get(v->dest_tile); + assert(u != NULL && u->type == VEH_ROAD && IsRoadVehFront(u)); uint dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos); -- cgit v1.2.3-54-g00ecf