cpp/openttd-patchpack/source Changeset - r12109:90df01928018

Changeset - r12109:90df01928018

Parent rev.

Child rev.

[Not reviewed]

master

0 36 0

smatz - 15 years ago 2009-06-06 16:54:22
smatz@openttd.org

(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check

36 files changed with 185 insertions and 161 deletions:

src/ai/api/ai_vehicle.cpp

src/aircraft_gui.cpp

src/articulated_vehicles.cpp

src/autoreplace_cmd.cpp

src/depot_gui.cpp

src/disaster_cmd.cpp

src/economy.cpp

src/newgrf_engine.cpp

src/npf.cpp

src/openttd.cpp

src/order_cmd.cpp

src/pbs.cpp

src/rail_cmd.cpp

src/road_cmd.cpp

src/roadveh_cmd.cpp

src/roadveh_gui.cpp

src/saveload/afterload.cpp

src/saveload/oldloader_sl.cpp

src/saveload/vehicle_sl.cpp

src/signal.cpp

src/station_cmd.cpp

src/train_cmd.cpp

src/train_gui.cpp

src/tunnelbridge_cmd.cpp

src/vehicle.cpp

src/vehicle_base.h

src/vehicle_cmd.cpp

src/vehicle_gui.cpp

src/vehicle_type.h

src/vehiclelist.cpp

src/water_cmd.cpp

src/yapf/follow_track.hpp

src/yapf/yapf_costrail.hpp

src/yapf/yapf_destrail.hpp

src/yapf/yapf_rail.cpp

src/yapf/yapf_road.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_vehicle.cpp

➞

Show inline comments

@@ @@ -43,17 +43,17 @@ @@
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 	switch (v->type) {
 		case VEH_ROAD: {
 			uint total_length = 0;
 			for (const Vehicle *u = v; u != NULL; u = u->Next()) {
-				total_length += ((const RoadVehicle *)u)->rcache.cached_veh_length;
+				total_length += ::RoadVehicle::From(u)->rcache.cached_veh_length;
+			}
 			return total_length;
+		}
-		case VEH_TRAIN: return ((const Train *)v)->tcache.cached_total_length;
+		case VEH_TRAIN: return ::Train::From(v)->tcache.cached_total_length;
 		default: return -1;
+	}
+}
 /* static */ VehicleID AIVehicle::BuildVehicle(TileIndex depot, EngineID engine_id)
+{
@@ @@ -83,17 +83,17 @@ @@
+{
 	EnforcePrecondition(false, IsValidVehicle(source_vehicle_id) && source_wagon < GetNumWagons(source_vehicle_id));
 	EnforcePrecondition(false, dest_vehicle_id == -1 || (IsValidVehicle(dest_vehicle_id) && dest_wagon < GetNumWagons(dest_vehicle_id)));
 	EnforcePrecondition(false, ::Vehicle::Get(source_vehicle_id)->type == VEH_TRAIN);
 	EnforcePrecondition(false, dest_vehicle_id == -1 || ::Vehicle::Get(dest_vehicle_id)->type == VEH_TRAIN);
-	const Train *v = (const Train *)::Vehicle::Get(source_vehicle_id);
+	const Train *v = ::Train::Get(source_vehicle_id);
 	while (source_wagon-- > 0) v = GetNextUnit(v);
 	const Train *w = NULL;
 	if (dest_vehicle_id != -1) {
-		w = (const Train *)::Vehicle::Get(dest_vehicle_id);
+		w = ::Train::Get(dest_vehicle_id);
 		while (dest_wagon-- > 0) w = GetNextUnit(w);
+	}
 	return AIObject::DoCommand(0, v->index | ((w == NULL ? INVALID_VEHICLE : w->index) << 16), move_attached_wagons ? 1 : 0, CMD_MOVE_RAIL_VEHICLE);
+}
@@ @@ -134,13 +134,13 @@ @@
 /* static */ bool AIVehicle::_SellWagonInternal(VehicleID vehicle_id, int wagon, bool sell_attached_wagons)
+{
 	EnforcePrecondition(false, IsValidVehicle(vehicle_id) && wagon < GetNumWagons(vehicle_id));
 	EnforcePrecondition(false, ::Vehicle::Get(vehicle_id)->type == VEH_TRAIN);
-	const Train *v = (const Train *)::Vehicle::Get(vehicle_id);
+	const Train *v = ::Train::Get(vehicle_id);
 	while (wagon-- > 0) v = GetNextUnit(v);
 	return AIObject::DoCommand(0, v->index, sell_attached_wagons ? 1 : 0, CMD_SELL_RAIL_WAGON);
+}
 /* static */ bool AIVehicle::SellWagon(VehicleID vehicle_id, int wagon)
@@ @@ -241,13 +241,13 @@ @@
+{
 	if (!IsValidVehicle(vehicle_id)) return INVALID_ENGINE;
 	if (wagon >= GetNumWagons(vehicle_id)) return INVALID_ENGINE;
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 	if (v->type == VEH_TRAIN) {
-		while (wagon-- > 0) v = GetNextUnit((const Train *)v);
+		while (wagon-- > 0) v = GetNextUnit(::Train::From(v));
+	}
 	return v->engine_type;
+}
 /* static */ int32 AIVehicle::GetUnitNumber(VehicleID vehicle_id)
+{
@@ @@ -279,13 +279,13 @@ @@
+{
 	if (!IsValidVehicle(vehicle_id)) return -1;
 	if (wagon >= GetNumWagons(vehicle_id)) return -1;
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 	if (v->type == VEH_TRAIN) {
-		while (wagon-- > 0) v = GetNextUnit((const Train *)v);
+		while (wagon-- > 0) v = GetNextUnit(::Train::From(v));
+	}
 	return v->age;
+}
 /* static */ int32 AIVehicle::GetMaxAge(VehicleID vehicle_id)
+{
@@ @@ -366,13 +366,13 @@ @@
 /* static */ AIRoad::RoadType AIVehicle::GetRoadType(VehicleID vehicle_id)
+{
 	if (!IsValidVehicle(vehicle_id)) return AIRoad::ROADTYPE_INVALID;
 	if (GetVehicleType(vehicle_id) != VT_ROAD) return AIRoad::ROADTYPE_INVALID;
-	return (AIRoad::RoadType)((RoadVehicle*)::Vehicle::Get(vehicle_id))->roadtype;
+	return (AIRoad::RoadType)(::RoadVehicle::Get(vehicle_id))->roadtype;
+}
 /* static */ int32 AIVehicle::GetCapacity(VehicleID vehicle_id, CargoID cargo)
+{
 	if (!IsValidVehicle(vehicle_id)) return -1;
 	if (!AICargo::IsValidCargo(cargo)) return -1;
@@ @@ -409,14 +409,14 @@ @@
+{
 	if (!IsValidVehicle(vehicle_id)) return false;
 	if (GetVehicleType(vehicle_id) != VT_ROAD && GetVehicleType(vehicle_id) != VT_RAIL) return false;
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 	switch (v->type) {
 		case VEH_ROAD: return RoadVehHasArticPart(v);
 		case VEH_TRAIN: return EngineHasArticPart(v);
 		case VEH_ROAD: return ::RoadVehHasArticPart(v);
 		case VEH_TRAIN: return ::EngineHasArticPart(v);
 		default: NOT_REACHED();
+	}
+}
 /* static */ bool AIVehicle::HasSharedOrders(VehicleID vehicle_id)
+{

src/aircraft_gui.cpp

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ void DrawAircraftDetails(const Vehicle * @@
 void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection)
+{
 	SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 	DrawSprite(v->GetImage(DIR_W), pal, x + 25, y + 10);
 	if (v->subtype == AIR_HELICOPTER) {
-		const Aircraft *a = (const Aircraft *)v;
+		const Aircraft *a = Aircraft::From(v);
 		SpriteID rotor_sprite = GetCustomRotorSprite(a, true);
 		if (rotor_sprite == 0) rotor_sprite = SPR_ROTOR_STOPPED;
 		DrawSprite(rotor_sprite, PAL_NONE, x + 25, y + 5);
+	}
 	if (v->index == selection) {
 		DrawFrameRect(x - 1, y - 1, x + 58, y + 21, COLOUR_WHITE, FR_BORDERONLY);

src/articulated_vehicles.cpp

➞

Show inline comments

@@ @@ -205,13 +205,13 @@ bool IsArticulatedVehicleCarryingDiffere @@
 				return true;
+			}
+		}
 		switch (v->type) {
 			case VEH_TRAIN:
-				v = (EngineHasArticPart((const Train *)v) ? GetNextArticPart((const Train *)v) : NULL);
+				v = (EngineHasArticPart(Train::From(v)) ? GetNextArticPart(Train::From(v)) : NULL);
 				break;
 			case VEH_ROAD:
 				v = (RoadVehHasArticPart(v) ? v->Next() : NULL);
 				break;
@@ @@ -253,13 +253,13 @@ void CheckConsistencyOfArticulatedVehicl @@
 		assert(v->cargo_type < NUM_CARGO);
 		real_default_capacity[v->cargo_type] += v->cargo_cap;
 		switch (v->type) {
 			case VEH_TRAIN:
-				v = (EngineHasArticPart((const Train *)v) ? GetNextArticPart((const Train *)v) : NULL);
+				v = (EngineHasArticPart(Train::From(v)) ? GetNextArticPart(Train::From(v)) : NULL);
 				break;
 			case VEH_ROAD:
 				v = (RoadVehHasArticPart(v) ? v->Next() : NULL);
 				break;
@@ @@ -302,13 +302,13 @@ void AddArticulatedParts(Vehicle *first, @@
 		const Engine *e_artic = Engine::Get(engine_type);
 		switch (type) {
 			default: NOT_REACHED();
 			case VEH_TRAIN: {
-				Train *front = (Train *)first;
+				Train *front = Train::From(first);
 				Train *t = new Train();
 				v->SetNext(t);
 				v = t;
 				t->subtype = 0;
 				t->track = front->track;
@@ @@ -325,13 +325,13 @@ void AddArticulatedParts(Vehicle *first, @@
+				}
 				SetArticulatedPart(t);
 			} break;
 			case VEH_ROAD: {
-				RoadVehicle *front = (RoadVehicle *)first;
+				RoadVehicle *front = RoadVehicle::From(first);
 				RoadVehicle *rv = new RoadVehicle();
 				v->SetNext(rv);
 				v = rv;
 				rv->subtype = 0;
 				rv->rcache.first_engine = front->engine_type;

src/autoreplace_cmd.cpp

➞

Show inline comments

@@ @@ -89,37 +89,37 @@ bool CheckAutoreplaceValidity(EngineID f @@
  */
 static void TransferCargo(Vehicle *old_veh, Vehicle *new_head, bool part_of_chain)
+{
 	assert(!part_of_chain || new_head->IsPrimaryVehicle());
 	/* Loop through source parts */
 	for (Vehicle *src = old_veh; src != NULL; src = src->Next()) {
-		if (!part_of_chain && src->type == VEH_TRAIN && src != old_veh && src != ((Train *)old_veh)->other_multiheaded_part && !IsArticulatedPart(src)) {
+		if (!part_of_chain && src->type == VEH_TRAIN && src != old_veh && src != Train::From(old_veh)->other_multiheaded_part && !IsArticulatedPart(src)) {
 			/* Skip vehicles, which do not belong to old_veh */
-			src = GetLastEnginePart((Train *)src);
+			src = GetLastEnginePart(Train::From(src));
 			continue;
+		}
 		if (src->cargo_type >= NUM_CARGO || src->cargo.Count() == 0) continue;
 		/* Find free space in the new chain */
 		for (Vehicle *dest = new_head; dest != NULL && src->cargo.Count() > 0; dest = dest->Next()) {
-			if (!part_of_chain && dest->type == VEH_TRAIN && dest != new_head && dest != ((Train *)new_head)->other_multiheaded_part && !IsArticulatedPart(dest)) {
+			if (!part_of_chain && dest->type == VEH_TRAIN && dest != new_head && dest != Train::From(new_head)->other_multiheaded_part && !IsArticulatedPart(dest)) {
 				/* Skip vehicles, which do not belong to new_head */
-				dest = GetLastEnginePart((Train *)dest);
+				dest = GetLastEnginePart(Train::From(dest));
 				continue;
+			}
 			if (dest->cargo_type != src->cargo_type) continue;
 			uint amount = min(src->cargo.Count(), dest->cargo_cap - dest->cargo.Count());
 			if (amount <= 0) continue;
 			src->cargo.MoveTo(&dest->cargo, amount);
+		}
+	}
 	/* Update train weight etc., the old vehicle will be sold anyway */
-	if (part_of_chain && new_head->type == VEH_TRAIN) TrainConsistChanged((Train *)new_head, true);
+	if (part_of_chain && new_head->type == VEH_TRAIN) TrainConsistChanged(Train::From(new_head), true);
+}
 /**
  * Tests whether refit orders that applied to v will also apply to the new vehicle type
  * @param v The vehicle to be replaced
  * @param engine_type The type we want to replace with
@@ @@ -266,13 +266,13 @@ static CommandCost BuildReplacementVehic @@
 	if (refit_cargo != CT_NO_REFIT) {
 		cost.AddCost(DoCommand(0, new_veh->index, refit_cargo, DC_EXEC, GetCmdRefitVeh(new_veh)));
 		assert(cost.Succeeded()); // This should be ensured by GetNewCargoTypeForReplace()
+	}
 	/* Try to reverse the vehicle, but do not care if it fails as the new type might not be reversible */
-	if (new_veh->type == VEH_TRAIN && HasBit(((Train *)old_veh)->flags, VRF_REVERSE_DIRECTION)) {
+	if (new_veh->type == VEH_TRAIN && HasBit(Train::From(old_veh)->flags, VRF_REVERSE_DIRECTION)) {
 		DoCommand(0, new_veh->index, true, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION);
+	}
 	return cost;
+}
@@ @@ -400,26 +400,26 @@ static CommandCost ReplaceChain(Vehicle @@
 	assert(old_head->IsPrimaryVehicle());
 	CommandCost cost = CommandCost(EXPENSES_NEW_VEHICLES, 0);
 	if (old_head->type == VEH_TRAIN) {
 		/* Store the length of the old vehicle chain, rounded up to whole tiles */
-		uint16 old_total_length = (((Train *)old_head)->tcache.cached_total_length + TILE_SIZE - 1) / TILE_SIZE * TILE_SIZE;
+		uint16 old_total_length = (Train::From(old_head)->tcache.cached_total_length + TILE_SIZE - 1) / TILE_SIZE * TILE_SIZE;
 		int num_units = 0; ///< Number of units in the chain
-		for (Train *w = (Train *)old_head; w != NULL; w = GetNextUnit(w)) num_units++;
+		for (Train *w = Train::From(old_head); w != NULL; w = GetNextUnit(w)) num_units++;
 		Train **old_vehs = CallocT<Train *>(num_units); ///< Will store vehicles of the old chain in their order
 		Train **new_vehs = CallocT<Train *>(num_units); ///< New vehicles corresponding to old_vehs or NULL if no replacement
 		Money *new_costs = MallocT<Money>(num_units);   ///< Costs for buying and refitting the new vehicles
 		/* Collect vehicles and build replacements
 		 * Note: The replacement vehicles can only successfully build as long as the old vehicles are still in their chain */
 		int i;
 		Train *w;
-		for (w = (Train *)old_head, i = 0; w != NULL; w = GetNextUnit(w), i++) {
+		for (w = Train::From(old_head), i = 0; w != NULL; w = GetNextUnit(w), i++) {
 			assert(i < num_units);
 			old_vehs[i] = w;
 			CommandCost ret = BuildReplacementVehicle(old_vehs[i], (Vehicle**)&new_vehs[i], true);
 			cost.AddCost(ret);
 			if (cost.Failed()) break;
@@ @@ -429,13 +429,13 @@ static CommandCost ReplaceChain(Vehicle @@
+		}
 		Train *new_head = (new_vehs[0] != NULL ? new_vehs[0] : old_vehs[0]);
 		/* Note: When autoreplace has already failed here, old_vehs[] is not completely initialized. But it is also not needed. */
 		if (cost.Succeeded()) {
 			/* Separate the head, so we can start constructing the new chain */
-			Train *second = GetNextUnit((Train *)old_head);
+			Train *second = GetNextUnit(Train::From(old_head));
 			if (second != NULL) cost.AddCost(MoveVehicle(second, NULL, DC_EXEC | DC_AUTOREPLACE, true));
 			assert(GetNextUnit(new_head) == NULL);
 			/* Append engines to the new chain
 			 * We do this from back to front, so that the head of the temporary vehicle chain does not change all the time.
@@ @@ -535,16 +535,16 @@ static CommandCost ReplaceChain(Vehicle @@
 			/* If we are not in DC_EXEC undo everything, i.e. rearrange old vehicles.
 			 * We do this from back to front, so that the head of the temporary vehicle chain does not change all the time.
 			 * Note: The vehicle attach callback is disabled here :) */
 			if ((flags & DC_EXEC) == 0) {
 				/* Separate the head, so we can reattach the old vehicles */
-				Train *second = GetNextUnit((Train *)old_head);
+				Train *second = GetNextUnit(Train::From(old_head));
 				if (second != NULL) MoveVehicle(second, NULL, DC_EXEC | DC_AUTOREPLACE, true);
-				assert(GetNextUnit((Train *)old_head) == NULL);
+				assert(GetNextUnit(Train::From(old_head)) == NULL);
 				for (int i = num_units - 1; i > 0; i--) {
 					CommandCost ret = MoveVehicle(old_vehs[i], old_head, DC_EXEC | DC_AUTOREPLACE, false);
 					assert(ret.Succeeded());
+				}
+			}
@@ @@ -629,13 +629,13 @@ CommandCost CmdAutoreplaceVehicle(TileIn @@
 	/* Test whether any replacement is set, before issuing a whole lot of commands that would end in nothing changed */
 	Vehicle *w = v;
 	bool any_replacements = false;
 	while (w != NULL && !any_replacements) {
 		any_replacements = (GetNewEngineType(w, c) != INVALID_ENGINE);
-		w = (!free_wagon && w->type == VEH_TRAIN ? GetNextUnit((Train *)w) : NULL);
+		w = (!free_wagon && w->type == VEH_TRAIN ? GetNextUnit(Train::From(w)) : NULL);
+	}
 	if (any_replacements) {
 		bool was_stopped = free_wagon || ((v->vehstatus & VS_STOPPED) != 0);
 		/* Stop the vehicle */

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -269,13 +269,13 @@ struct DepotWindow : Window { @@
 		switch (v->type) {
 			case VEH_TRAIN:
 				DrawTrainImage(v, x + 21, sprite_y, this->sel, this->hscroll.cap + 4, this->hscroll.pos);
 				/* Number of wagons relative to a standard length wagon (rounded up) */
-				SetDParam(0, (((const Train *)v)->tcache.cached_total_length + 7) / 8);
+				SetDParam(0, (Train::From(v)->tcache.cached_total_length + 7) / 8);
 				DrawString(this->widget[DEPOT_WIDGET_MATRIX].left, this->widget[DEPOT_WIDGET_MATRIX].right - 1, y + 4, STR_TINY_BLACK, TC_FROMSTRING, SA_RIGHT); // Draw the counter
 				break;
 			case VEH_ROAD:     DrawRoadVehImage( v, x + 24, sprite_y, this->sel, 1); break;
 			case VEH_SHIP:     DrawShipImage(    v, x + 19, sprite_y - 1, this->sel); break;
 			case VEH_AIRCRAFT: {
@@ @@ -325,13 +325,13 @@ struct DepotWindow : Window { @@
 		/* determine amount of items for scroller */
 		if (this->type == VEH_TRAIN) {
 			hnum = 8;
 			for (uint num = 0; num < this->vehicle_list.Length(); num++) {
 				const Vehicle *v = this->vehicle_list[num];
-				hnum = max(hnum, ((const Train *)v)->tcache.cached_total_length);
+				hnum = max(hnum, Train::From(v)->tcache.cached_total_length);
+			}
 			/* Always have 1 empty row, so people can change the setting of the train */
 			SetVScrollCount(w, this->vehicle_list.Length() + this->wagon_list.Length() + 1);
 			SetHScrollCount(w, WagonLengthToPixels(hnum));
 		} else {
 			SetVScrollCount(w, (this->vehicle_list.Length() + this->hscroll.cap - 1) / this->hscroll.cap);
@@ @@ -447,13 +447,13 @@ struct DepotWindow : Window { @@
 				x = (x * 8) / _traininfo_vehicle_width;
 				/* Skip vehicles that are scrolled off the list */
 				x += skip;
 				/* find the vehicle in this row that was clicked */
-				while (v != NULL && (x -= ((const Train *)v)->tcache.cached_veh_length) >= 0) v = v->Next();
+				while (v != NULL && (x -= Train::From(v)->tcache.cached_veh_length) >= 0) v = v->Next();
 				/* if an articulated part was selected, find its parent */
 				while (v != NULL && IsArticulatedPart(v)) v = v->Previous();
 				d->wagon = v;
@@ @@ -511,17 +511,17 @@ struct DepotWindow : Window { @@
 					this->sel = v->index;
 					this->SetDirty();
 					SetObjectToPlaceWnd(image, GetVehiclePalette(v), HT_DRAG, this);
 					switch (v->type) {
 						case VEH_TRAIN:
-							_cursor.short_vehicle_offset = 16 - ((const Train *)v)->tcache.cached_veh_length * 2;
+							_cursor.short_vehicle_offset = 16 - Train::From(v)->tcache.cached_veh_length * 2;
 							break;
 						case VEH_ROAD:
-							_cursor.short_vehicle_offset = 16 - ((const RoadVehicle *)v)->rcache.cached_veh_length * 2;
+							_cursor.short_vehicle_offset = 16 - RoadVehicle::From(v)->rcache.cached_veh_length * 2;
 							break;
 						default:
 							_cursor.short_vehicle_offset = 0;
 							break;
+					}

src/disaster_cmd.cpp

➞

Show inline comments

@@ @@ -310,15 +310,14 @@ static bool DisasterTick_Ufo(DisasterVeh @@
+		}
 		delete 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);
 		if (dist < TILE_SIZE && !(u->vehstatus & VS_HIDDEN) && u->breakdown_ctr == 0) {
 			u->breakdown_ctr = 3;
 			u->breakdown_delay = 140;

src/economy.cpp

➞

Show inline comments

@@ @@ -1311,13 +1311,13 @@ static void LoadUnloadVehicle(Vehicle *v @@
 		/* Do not pick up goods when we have no-load set. */
 		if (u->current_order.GetLoadType() & OLFB_NO_LOAD) continue;
 		/* update stats */
 		int t;
 		switch (u->type) {
-			case VEH_TRAIN: t = ((Train *)u)->tcache.cached_max_speed; break;
+			case VEH_TRAIN: t = Train::From(u)->tcache.cached_max_speed; break;
 			case VEH_ROAD:  t = u->max_speed / 2;           break;
 			default:        t = u->max_speed;               break;
+		}
 		/* if last speed is 0, we treat that as if no vehicle has ever visited the station. */
 		ge->last_speed = min(t, 255);
@@ @@ -1420,13 +1420,13 @@ static void LoadUnloadVehicle(Vehicle *v @@
 		SB(v->vehicle_flags, VF_LOADING_FINISHED, 1, finished_loading);
+	}
 	if (v->type == VEH_TRAIN) {
 		/* Each platform tile is worth 2 rail vehicles. */
-		int overhang = ((Train *)v)->tcache.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
+		int overhang = Train::From(v)->tcache.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
 		if (overhang > 0) {
 			unloading_time <<= 1;
 			unloading_time += (overhang * unloading_time) / 8;
+		}
+	}

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -431,15 +431,15 @@ static uint8 LiveryHelper(EngineID engin @@
 	const Livery *l;
 	if (v == NULL) {
 		if (!Company::IsValidID(_current_company)) return 0;
 		l = GetEngineLivery(engine, _current_company, INVALID_ENGINE, NULL);
 	} else if (v->type == VEH_TRAIN) {
-		l = GetEngineLivery(v->engine_type, v->owner, ((const Train *)v)->tcache.first_engine, v);
+		l = GetEngineLivery(v->engine_type, v->owner, Train::From(v)->tcache.first_engine, v);
 	} else if (v->type == VEH_ROAD) {
-		l = GetEngineLivery(v->engine_type, v->owner, ((const RoadVehicle *)v)->rcache.first_engine, v);
+		l = GetEngineLivery(v->engine_type, v->owner, RoadVehicle::From(v)->rcache.first_engine, v);
 	} else {
 		l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v);
+	}
 	return l->colour1 + l->colour2 * 16;
+}
@@ @@ -531,13 +531,13 @@ static uint32 VehicleGetVariable(const R @@
 				/* Reset our arrays */
 				memset(common_cargos, 0, sizeof(common_cargos));
 				memset(common_subtypes, 0, sizeof(common_subtypes));
 				for (u = v; u != NULL; u = u->Next()) {
-					if (v->type == VEH_TRAIN) user_def_data |= ((const Train *)u)->tcache.user_def_data;
+					if (v->type == VEH_TRAIN) user_def_data |= Train::From(u)->tcache.user_def_data;
 					/* Skip empty engines */
 					if (u->cargo_cap == 0) continue;
 					cargo_classes |= GetCargo(u->cargo_type)->classes;
 					common_cargos[u->cargo_type]++;
@@ @@ -587,13 +587,13 @@ static uint32 VehicleGetVariable(const R @@
+			{
 				const Vehicle *w = v->Next();
 				uint16 altitude = v->z_pos - w->z_pos; // Aircraft height - shadow height
 				byte airporttype = ATP_TTDP_LARGE;
-				const Station *st = GetTargetAirportIfValid((Aircraft *)v);
+				const Station *st = GetTargetAirportIfValid(Aircraft::From(v));
 				if (st != NULL) {
 					switch (st->airport_type) {
 						/* Note, Helidepot and Helistation are treated as small airports
 						 * as they are at ground level. */
 						case AT_HELIDEPOT:
@@ @@ -665,13 +665,13 @@ static uint32 VehicleGetVariable(const R @@
 		case 0xFE:
 		case 0xFF: {
 			uint16 modflags = 0;
 			if (v->type == VEH_TRAIN) {
-				const Train *t = (const Train *)v;
+				const Train *t = Train::From(v);
 				const Train *u = IsTrainWagon(v) && HasBit(v->vehicle_flags, VRF_POWEREDWAGON) ? t->First() : t;
 				RailType railtype = GetRailType(v->tile);
 				bool powered = IsTrainEngine(v) || (IsTrainWagon(v) && HasBit(v->vehicle_flags, VRF_POWEREDWAGON));
 				bool has_power = powered && HasPowerOnRail(u->railtype, railtype);
 				bool is_electric = powered && u->railtype == RAILTYPE_ELECTRIC;
@@ @@ -733,13 +733,13 @@ static uint32 VehicleGetVariable(const R @@
 		case 0x44: return Clamp(v->build_year, ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR;
 		case 0x45: return v->unitnumber;
 		case 0x46: return Engine::Get(v->engine_type)->internal_id;
 		case 0x47: return GB(Engine::Get(v->engine_type)->internal_id, 8, 8);
 		case 0x48:
 			if (v->type != VEH_TRAIN || v->spritenum != 0xFD) return v->spritenum;
-			return HasBit(((Train *)v)->flags, VRF_REVERSE_DIRECTION) ? 0xFE : 0xFD;
+			return HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION) ? 0xFE : 0xFD;
 		case 0x49: return v->day_counter;
 		case 0x4A: return v->breakdowns_since_last_service;
 		case 0x4B: return v->breakdown_ctr;
 		case 0x4C: return v->breakdown_delay;
 		case 0x4D: return v->breakdown_chance;
@@ @@ -765,13 +765,13 @@ static uint32 VehicleGetVariable(const R @@
 		case 0x7B: return v->waiting_triggers;
+	}
 	/* Vehicle specific properties */
 	switch (v->type) {
 		case VEH_TRAIN: {
-			Train *t = (Train *)v;
+			Train *t = Train::From(v);
 			switch (variable - 0x80) {
 				case 0x62: return t->track;
 				case 0x66: return t->railtype;
 				case 0x73: return t->tcache.cached_veh_length;
 				case 0x74: return t->tcache.cached_power;
 				case 0x75: return GB(t->tcache.cached_power,  8, 24);
@@ @@ -781,26 +781,26 @@ static uint32 VehicleGetVariable(const R @@
 				case 0x7D: return GB(t->First()->index, 8, 8);
 				case 0x7F: return 0; // Used for vehicle reversing hack in TTDP
+			}
 		} break;
 		case VEH_ROAD: {
-			RoadVehicle *rv = (RoadVehicle *)v;
+			RoadVehicle *rv = RoadVehicle::From(v);
 			switch (variable - 0x80) {
 				case 0x62: return rv->state;
 				case 0x64: return rv->blocked_ctr;
 				case 0x65: return GB(rv->blocked_ctr, 8, 8);
 				case 0x66: return rv->overtaking;
 				case 0x67: return rv->overtaking_ctr;
 				case 0x68: return rv->crashed_ctr;
 				case 0x69: return GB(rv->crashed_ctr, 8, 8);
+			}
 		} break;
 		case VEH_AIRCRAFT: {
-			Aircraft *a = (Aircraft *)v;
+			Aircraft *a = Aircraft::From(v);
 			switch (variable - 0x80) {
 				case 0x62: return MapAircraftMovementState(a);  // Current movement state
 				case 0x63: return a->targetairport;             // Airport to which the action refers
 				case 0x66: return MapAircraftMovementAction(a); // Current movement action
+			}
 		} break;
@@ @@ -883,16 +883,16 @@ static const SpriteGroup *GetVehicleSpri @@
 		cargo = v->cargo_type;
 		if (v->type == VEH_TRAIN) {
 			/* We always use cached value, except for callbacks because the override spriteset
 			 * to use may be different than the one cached. It happens for callback 0x15 (refit engine),
 			 * as v->cargo_type is temporary changed to the new type */
-			group = use_cache ? ((const Train *)v)->tcache.cached_override : GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((const Train *)v)->tcache.first_engine);
+			group = use_cache ? Train::From(v)->tcache.cached_override : GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, Train::From(v)->tcache.first_engine);
 			if (group != NULL) return group;
 		} else if (v->type == VEH_ROAD) {
-			group = GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((const RoadVehicle *)v)->rcache.first_engine);
+			group = GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, RoadVehicle::From(v)->rcache.first_engine);
 			if (group != NULL) return group;
+		}
+	}
 	const Engine *e = Engine::Get(engine);
@@ @@ -949,13 +949,13 @@ SpriteID GetRotorOverrideSprite(EngineID @@
  * @param v The wagon to check
  * @return true if it is using an override, false otherwise
  */
 bool UsesWagonOverride(const Vehicle *v)
+{
 	assert(v->type == VEH_TRAIN);
-	return ((const Train *)v)->tcache.cached_override != NULL;
+	return Train::From(v)->tcache.cached_override != NULL;
+}
 /**
  * Evaluate a newgrf callback for vehicles
  * @param callback The callback to evalute
  * @param param1   First parameter of the callback

src/npf.cpp

➞

Show inline comments

@@ @@ -422,13 +422,13 @@ static int32 NPFFindDepot(AyStar *as, Op @@
 		AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
+}
 /** Find any safe and free tile. */
 static int32 NPFFindSafeTile(AyStar *as, OpenListNode *current)
+{
-	const Train *v = (const Train *)((NPFFindStationOrTileData*)as->user_target)->v;
+	const Train *v = Train::From(((NPFFindStationOrTileData *)as->user_target)->v);
 	return
 		IsSafeWaitingPosition(v, current->path.node.tile, current->path.node.direction, true, _settings_game.pf.forbid_90_deg) &&
 		IsWaitingPositionFree(v, current->path.node.tile, current->path.node.direction, _settings_game.pf.forbid_90_deg) ?
 			AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
+}
@@ @@ -503,13 +503,13 @@ static void NPFSaveTargetData(AyStar *as @@
 	ftd->best_bird_dist = 0;
 	ftd->node = current->path.node;
 	ftd->res_okay = false;
 	if (as->user_target != NULL && ((NPFFindStationOrTileData*)as->user_target)->reserve_path && as->user_data[NPF_TYPE] == TRANSPORT_RAIL) {
 		/* Path reservation is requested. */
-		const Train *v = (const Train *)((NPFFindStationOrTileData*)as->user_target)->v;
+		const Train *v = Train::From(((NPFFindStationOrTileData *)as->user_target)->v);
 		const PathNode *target = FindSafePosition(&current->path, v);
 		ftd->node = target->node;
 		/* If the target is a station skip to platform end. */
 		if (IsRailwayStationTile(target->node.tile)) {

src/openttd.cpp

➞

Show inline comments

@@ @@ -1116,24 +1116,24 @@ void StateGameLoop() @@
 			Vehicle *v;
 			FOR_ALL_VEHICLES(v) {
 				if (v != v->First()) continue;
 				switch (v->type) {
 					case VEH_ROAD: {
-						RoadVehicle *rv = (RoadVehicle *)v;
+						RoadVehicle *rv = RoadVehicle::From(v);
 						RoadVehicleCache cache = rv->rcache;
 						RoadVehUpdateCache(rv);
 						if (memcmp(&cache, &rv->rcache, sizeof(RoadVehicleCache)) != 0) {
 							DEBUG(desync, 2, "cache mismatch: vehicle %i, company %i, unit number %i\n", v->index, (int)v->owner, v->unitnumber);
+						}
 					} break;
 					case VEH_TRAIN: {
 						uint length = 0;
-						Train *t = (Train *)v;
+						Train *t = Train::From(v);
 						for (Vehicle *u = t; u != NULL; u = u->Next()) length++;
 						TrainCache *wagons = MallocT<TrainCache>(length);
 						length = 0;
 						for (Train *u = t; u != NULL; u = u->Next()) wagons[length++] = u->tcache;
@@ @@ -1148,13 +1148,13 @@ void StateGameLoop() @@
+						}
 						free(wagons);
 					} break;
 					case VEH_AIRCRAFT: {
-						Aircraft *a = (Aircraft *)v;
+						Aircraft *a = Aircraft::From(v);
 						AircraftCache cache = a->acache;
 						UpdateAircraftCache(a);
 						if (memcmp(&cache, &a->acache, sizeof(AircraftCache)) != 0) {
 							DEBUG(desync, 2, "cache mismatch: vehicle %i, company %i, unit number %i\n", v->index, (int)v->owner, v->unitnumber);
+						}

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -18,12 +18,13 @@ @@
 #include "timetable.h"
 #include "vehicle_func.h"
 #include "depot_base.h"
 #include "settings_type.h"
 #include "core/pool_func.hpp"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "table/strings.h"
 /* DestinationID must be at least as large as every these below, because it can
  * be any of them
  */
@@ @@ -731,13 +732,13 @@ CommandCost CmdSkipToOrder(TileIndex til @@
 		return CMD_ERROR;
+	}
 	if (flags & DC_EXEC) {
 		v->cur_order_index = sel_ord;
-		if (v->type == VEH_ROAD) ClearSlot((RoadVehicle *)v);
+		if (v->type == VEH_ROAD) ClearSlot(RoadVehicle::From(v));
 		if (v->current_order.IsType(OT_LOADING)) v->LeaveStation();
 		InvalidateVehicleOrder(v, 0);
+	}
@@ @@ -1357,13 +1358,13 @@ static TileIndex GetStationTileForVehicl @@
 	switch (v->type) {
 		default: NOT_REACHED();
 		case VEH_TRAIN:     return st->train_tile;
 		case VEH_AIRCRAFT:  return st->airport_tile;
 		case VEH_SHIP:      return st->dock_tile;
-		case VEH_ROAD:      return st->GetPrimaryRoadStop((RoadVehicle *)v)->xy;
+		case VEH_ROAD:      return st->GetPrimaryRoadStop(RoadVehicle::From(v))->xy;
+	}
+}
 /**
+ *
@@ @@ -1612,13 +1613,13 @@ bool UpdateOrderDest(Vehicle *v, const O @@
 					v->current_order.MakeGoToDepot(destination, v->current_order.GetDepotOrderType(), v->current_order.GetNonStopType(), (OrderDepotActionFlags)(v->current_order.GetDepotActionType() & ~ODATFB_NEAREST_DEPOT), v->current_order.GetRefitCargo(), v->current_order.GetRefitSubtype());
 					/* If there is no depot in front, reverse automatically (trains only) */
 					if (v->type == VEH_TRAIN && reverse) DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION);
 					if (v->type == VEH_AIRCRAFT) {
-						Aircraft *a = (Aircraft *)v;
+						Aircraft *a = Aircraft::From(v);
 						if (a->state == FLYING && a->targetairport != destination) {
 							/* The aircraft is now heading for a different hangar than the next in the orders */
 							extern void AircraftNextAirportPos_and_Order(Aircraft *a);
 							AircraftNextAirportPos_and_Order(a);
+						}
+					}
@@ @@ -1731,19 +1732,19 @@ bool ProcessOrders(Vehicle *v) @@
 	/* If no order, do nothing. */
 	if (order == NULL || (v->type == VEH_AIRCRAFT && order->IsType(OT_DUMMY) && !CheckForValidOrders(v))) {
 		if (v->type == VEH_AIRCRAFT) {
 			/* Aircraft do something vastly different here, so handle separately */
 			extern void HandleMissingAircraftOrders(Aircraft *v);
-			HandleMissingAircraftOrders((Aircraft *)v);
+			HandleMissingAircraftOrders(Aircraft::From(v));
 			return false;
+		}
 		v->current_order.Free();
 		v->dest_tile = 0;
-		if (v->type == VEH_ROAD) ClearSlot((RoadVehicle *)v);
+		if (v->type == VEH_ROAD) ClearSlot(RoadVehicle::From(v));
 		return false;
+	}
 	/* If it is unchanged, keep it. */
 	if (order->Equals(v->current_order) && (v->type == VEH_AIRCRAFT || v->dest_tile != 0) &&
 			(v->type != VEH_SHIP || !order->IsType(OT_GOTO_STATION) || Station::Get(order->GetDestination())->dock_tile != INVALID_TILE)) {

src/pbs.cpp

➞

Show inline comments

@@ @@ -232,13 +232,13 @@ struct FindTrainOnTrackInfo { @@
 static Vehicle *FindTrainOnTrackEnum(Vehicle *v, void *data)
+{
 	FindTrainOnTrackInfo *info = (FindTrainOnTrackInfo *)data;
 	if (v->type != VEH_TRAIN || (v->vehstatus & VS_CRASHED)) return NULL;
-	Train *t = (Train *)v;
+	Train *t = Train::From(v);
 	if (HasBit((TrackBits)t->track, TrackdirToTrack(info->res.trackdir))) {
 		t = t->First();
 		/* ALWAYS return the lowest ID (anti-desync!) */
 		if (info->best == NULL || t->index < info->best->index) info->best = t;
 		return t;

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -89,13 +89,13 @@ const byte _track_sloped_sprites[14] = { @@
 Vehicle *EnsureNoTrainOnTrackProc(Vehicle *v, void *data)
+{
 	TrackBits rail_bits = *(TrackBits *)data;
 	if (v->type != VEH_TRAIN) return NULL;
-	Train *t = (Train *)v;
+	Train *t = Train::From(v);
 	if ((t->track != rail_bits) && !TracksOverlap(t->track | rail_bits)) return NULL;
 	_error_message = VehicleInTheWayErrMsg(v);
 	return v;
+}
@@ @@ -1232,13 +1232,13 @@ CommandCost CmdRemoveSignalTrack(TileInd @@
 Vehicle *UpdateTrainPowerProc(Vehicle *v, void *data)
+{
 	/* Similiar checks as in TrainPowerChanged() */
 	if (v->type == VEH_TRAIN && !IsArticulatedPart(v)) {
 		const RailVehicleInfo *rvi = RailVehInfo(v->engine_type);
-		if (GetVehicleProperty(v, 0x0B, rvi->power) != 0) TrainPowerChanged((Train *)v->First());
+		if (GetVehicleProperty(v, 0x0B, rvi->power) != 0) TrainPowerChanged(Train::From(v)->First());
+	}
 	return NULL;
+}
 /** Convert one rail type to the other. You can convert normal rail to
@@ @@ -2458,13 +2458,13 @@ static VehicleEnterTileStatus VehicleEnt @@
 	DiagDirection dir;
 	int length;
 	/* this routine applies only to trains in depot tiles */
 	if (u->type != VEH_TRAIN || !IsRailDepotTile(tile)) return VETSB_CONTINUE;
-	Train *v = (Train *)u;
+	Train *v = Train::From(u);
 	/* depot direction */
 	dir = GetRailDepotDirection(tile);
 	/* calculate the point where the following wagon should be activated
 	 * this depends on the length of the current vehicle */

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -1538,13 +1538,13 @@ static const byte _roadveh_enter_depot_d @@
 static VehicleEnterTileStatus VehicleEnter_Road(Vehicle *v, TileIndex tile, int x, int y)
+{
 	switch (GetRoadTileType(tile)) {
 		case ROAD_TILE_DEPOT: {
 			if (v->type != VEH_ROAD) break;
-			RoadVehicle *rv = (RoadVehicle *)v;
+			RoadVehicle *rv = RoadVehicle::From(v);
 			if (rv->frame == RVC_DEPOT_STOP_FRAME &&
 					_roadveh_enter_depot_dir[GetRoadDepotDirection(tile)] == rv->state) {
 				rv->state = RVSB_IN_DEPOT;
 				rv->vehstatus |= VS_HIDDEN;
 				rv->direction = ReverseDir(rv->direction);
 				if (rv->Next() == NULL) VehicleEnterDepot(rv);

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -759,13 +759,13 @@ static RoadVehicle *RoadVehFindCloseTo(R @@
 		front->blocked_ctr = 0;
 		return NULL;
+	}
 	if (++front->blocked_ctr > 1480) return NULL;
-	return (RoadVehicle *)rvf.best;
+	return RoadVehicle::From(rvf.best);
+}
 static void RoadVehArrivesAt(const RoadVehicle *v, Station *st)
+{
 	if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) {
 		/* Check if station was ever visited before */

src/roadveh_gui.cpp

➞

Show inline comments

@@ @@ -127,13 +127,13 @@ void DrawRoadVehImage(const Vehicle *v, @@
 	int max_length = (count == 0) ? 80 : count * 8;
 	/* Width of highlight box */
 	int highlight_w = 0;
 	for (int dx = 0; v != NULL && dx < max_length ; v = v->Next()) {
-		int width = ((const RoadVehicle *)v)->rcache.cached_veh_length;
+		int width = RoadVehicle::From(v)->rcache.cached_veh_length;
 		if (dx + width > 0 && dx <= max_length) {
 			SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 			DrawSprite(v->GetImage(DIR_W), pal, x + 14 + RoadVehLengthToPixels(dx), y + 6);
 			if (v->index == selection) {

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -909,15 +909,15 @@ bool AfterLoadGame() @@
 			} else if (v->z_pos > GetSlopeZ(v->x_pos, v->y_pos)) {
 				v->tile = GetNorthernBridgeEnd(v->tile);
 			} else {
 				continue;
+			}
 			if (v->type == VEH_TRAIN) {
-				((Train *)v)->track = TRACK_BIT_WORMHOLE;
+				Train::From(v)->track = TRACK_BIT_WORMHOLE;
 			} else {
-				((RoadVehicle *)v)->state = RVSB_WORMHOLE;
+				RoadVehicle::From(v)->state = RVSB_WORMHOLE;
+			}
+		}
+	}
 	/* Elrails got added in rev 24 */
 	if (CheckSavegameVersion(24)) {

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -174,13 +174,13 @@ void FixOldVehicles() @@
 		if (v->type == VEH_EFFECT) v->subtype = v->subtype >> 1;
 		v->name = CopyFromOldName(_old_vehicle_names[v->index]);
 		/* We haven't used this bit for stations for ages */
 		if (v->type == VEH_ROAD) {
-			RoadVehicle *rv = (RoadVehicle *)v;
+			RoadVehicle *rv = RoadVehicle::From(v);
 			if (rv->state != RVSB_IN_DEPOT && rv->state != RVSB_WORMHOLE) {
 				ClrBit(rv->state, RVS_IS_STOPPING);
+			}
+		}
 		/* The subtype should be 0, but it sometimes isn't :( */
@@ @@ -1313,13 +1313,13 @@ bool LoadOldVehicle(LoadgameState *ls, i @@
 ,   2,   4,   4,   8,  10,  12,  14,  16,  18,  20,  22,  40,  42,  44,  46,
 ,  52,  54,  66,  68,  70,  72,  74,  76,  78,  80,  82,  84,  86, 120, 122,
 , 126, 128, 130, 132, 134, 136, 138, 140
 					};
 					if (v->spritenum / 2 >= lengthof(spriteset_rail)) return false;
 					v->spritenum = spriteset_rail[v->spritenum / 2]; // adjust railway sprite set offset
-					((Train *)v)->railtype = type == 0x25 ? 1 : 0; // monorail / rail
+					Train::From(v)->railtype = type == 0x25 ? 1 : 0; // monorail / rail
 					break;
+				}
 				case VEH_ROAD:
 					if (v->spritenum >= 22) v->spritenum += 12;
 					break;

src/saveload/vehicle_sl.cpp

➞

Show inline comments

@@ @@ -239,14 +239,14 @@ void AfterLoadVehicles(bool part_of_load @@
 		if (v->NextShared() != NULL) v->NextShared()->previous_shared = v;
 		v->UpdateDeltaXY(v->direction);
 		if (part_of_load) v->fill_percent_te_id = INVALID_TE_ID;
 		v->first = NULL;
 		if (v->type == VEH_TRAIN) ((Train *)v)->tcache.first_engine = INVALID_ENGINE;
 		if (v->type == VEH_ROAD)  ((RoadVehicle *)v)->rcache.first_engine = INVALID_ENGINE;
 		if (v->type == VEH_TRAIN) Train::From(v)->tcache.first_engine = INVALID_ENGINE;
 		if (v->type == VEH_ROAD)  RoadVehicle::From(v)->rcache.first_engine = INVALID_ENGINE;
 		v->cargo.InvalidateCache();
+	}
 	/* AfterLoadVehicles may also be called in case of NewGRF reload, in this
 	 * case we may not convert orders again. */
@@ @@ -305,16 +305,16 @@ void AfterLoadVehicles(bool part_of_load @@
 	CheckValidVehicles();
 	FOR_ALL_VEHICLES(v) {
 		assert(v->first != NULL);
 		if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) {
 			if (IsFrontEngine(v)) ((Train *)v)->tcache.last_speed = v->cur_speed; // update displayed train speed
 			TrainConsistChanged((Train *)v, false);
 			if (IsFrontEngine(v)) Train::From(v)->tcache.last_speed = v->cur_speed; // update displayed train speed
 			TrainConsistChanged(Train::From(v), false);
 		} else if (v->type == VEH_ROAD && IsRoadVehFront(v)) {
-			RoadVehUpdateCache((RoadVehicle *)v);
+			RoadVehUpdateCache(RoadVehicle::From(v));
+		}
+	}
 	/* Stop non-front engines */
 	if (CheckSavegameVersion(112)) {
 		FOR_ALL_VEHICLES(v) {
@@ @@ -332,13 +332,13 @@ void AfterLoadVehicles(bool part_of_load @@
+		}
+	}
 	FOR_ALL_VEHICLES(v) {
 		switch (v->type) {
 			case VEH_ROAD: {
-				RoadVehicle *rv = (RoadVehicle *)v;
+				RoadVehicle *rv = RoadVehicle::From(v);
 				rv->roadtype = HasBit(EngInfo(v->First()->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD;
 				rv->compatible_roadtypes = RoadTypeToRoadTypes(rv->roadtype);
+			}
 				/* FALL THROUGH */
 			case VEH_TRAIN:
 			case VEH_SHIP:
@@ @@ -353,16 +353,16 @@ void AfterLoadVehicles(bool part_of_load @@
 					Vehicle *shadow = v->Next();
 					shadow->cur_image = v->cur_image;
 					/* In the case of a helicopter we will update the rotor sprites */
 					if (v->subtype == AIR_HELICOPTER) {
 						Vehicle *rotor = shadow->Next();
-						rotor->cur_image = GetRotorImage((Aircraft *)v);
+						rotor->cur_image = GetRotorImage(Aircraft::From(v));
+					}
-					UpdateAircraftCache((Aircraft *)v);
+					UpdateAircraftCache(Aircraft::From(v));
+				}
 				break;
 			default: break;
+		}
 		v->coord.left = INVALID_COORD;

src/signal.cpp

➞

Show inline comments

@@ @@ -181,13 +181,13 @@ static SmallSet<DiagDirection, SIG_TBD_S @@
 static SmallSet<DiagDirection, SIG_GLOB_SIZE> _globset("_globset"); ///< set of places to be updated in following runs
 /** Check whether there is a train on rail, not in a depot */
 static Vehicle *TrainOnTileEnum(Vehicle *v, void *)
+{
-	if (v->type != VEH_TRAIN || ((Train *)v)->track == TRACK_BIT_DEPOT) return NULL;
+	if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL;
 	return v;
+}
 /**

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1485,13 +1485,13 @@ CommandCost CmdBuildRoadStop(TileIndex t @@
 	return cost;
+}
 static Vehicle *ClearRoadStopStatusEnum(Vehicle *v, void *)
+{
-	if (v->type == VEH_ROAD) ((RoadVehicle *)v)->state &= RVSB_ROAD_STOP_TRACKDIR_MASK;
+	if (v->type == VEH_ROAD) RoadVehicle::From(v)->state &= RVSB_ROAD_STOP_TRACKDIR_MASK;
 	return NULL;
+}
 /** Remove a bus station
@@ @@ -2614,13 +2614,13 @@ static VehicleEnterTileStatus VehicleEnt @@
 	if (v->type == VEH_TRAIN) {
 		if (!v->current_order.ShouldStopAtStation(v, station_id)) return VETSB_CONTINUE;
 		if (!IsRailwayStation(tile) || !IsFrontEngine(v)) return VETSB_CONTINUE;
 		int station_ahead;
 		int station_length;
-		int stop = GetTrainStopLocation(station_id, tile, (Train *)v, &station_ahead, &station_length);
+		int stop = GetTrainStopLocation(station_id, tile, Train::From(v), &station_ahead, &station_length);
 		/* Stop whenever that amount of station ahead + the distance from the
 		 * begin of the platform to the stop location is longer than the length
 		 * of the platform. Station ahead 'includes' the current tile where the
 		 * vehicle is on, so we need to substract that. */
 		if (!IsInsideBS(stop + station_ahead, station_length, TILE_SIZE)) return VETSB_CONTINUE;
@@ @@ -2642,13 +2642,13 @@ static VehicleEnterTileStatus VehicleEnt @@
 				v->vehstatus |= VS_TRAIN_SLOWING;
 				spd = max(0, (stop - x) * 20 - 15);
 				if (spd < v->cur_speed) v->cur_speed = spd;
+			}
+		}
 	} else if (v->type == VEH_ROAD) {
-		RoadVehicle *rv = (RoadVehicle *)v;
+		RoadVehicle *rv = RoadVehicle::From(v);
 		if (rv->state < RVSB_IN_ROAD_STOP && !IsReversingRoadTrackdir((Trackdir)rv->state) && rv->frame == 0) {
 			if (IsRoadStop(tile) && IsRoadVehFront(v)) {
 				/* Attempt to allocate a parking bay in a road stop */
 				RoadStop *rs = GetRoadStopByTile(tile, GetRoadStopType(tile));
 				if (IsDriveThroughStopTile(tile)) {

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1722,13 +1722,13 @@ static Vehicle *TrainApproachingCrossing @@
+{
 	/* not a train || not front engine || crashed */
 	if (v->type != VEH_TRAIN || !IsFrontEngine(v) || (v->vehstatus & VS_CRASHED)) return NULL;
 	TileIndex tile = *(TileIndex*)data;
-	if (TrainApproachingCrossingTile((Train *)v) != tile) return NULL;
+	if (TrainApproachingCrossingTile(Train::From(v)) != tile) return NULL;
 	return v;
+}
 /**
@@ @@ -1797,13 +1797,13 @@ static inline void MaybeBarCrossingWithS @@
  * @param v First vehicle in chain
  */
 static void AdvanceWagonsBeforeSwap(Train *v)
+{
 	Train *base = v;
 	Train *first = base; // first vehicle to move
-	Train *last = (Train *)GetLastVehicleInChain(v); // last vehicle to move
+	Train *last = Train::From(GetLastVehicleInChain(v)); // last vehicle to move
 	uint length = CountVehiclesInChain(v);
 	while (length > 2) {
 		last = last->Previous();
 		first = first->Next();
@@ @@ -1846,13 +1846,13 @@ static void AdvanceWagonsAfterSwap(Train @@
 	} else {
 		dep = NULL; // no vehicle in a depot, so no vehicle leaving a depot
+	}
 	Train *base = v;
 	Train *first = base; // first vehicle to move
-	Train *last = (Train *)GetLastVehicleInChain(v); // last vehicle to move
+	Train *last = Train::From(GetLastVehicleInChain(v)); // last vehicle to move
 	uint length = CountVehiclesInChain(v);
 	/* we have to make sure all wagons that leave a depot because of train reversing are moved coorectly
 	 * they have already correct spacing, so we have to make sure they are moved how they should */
 	bool nomove = (dep == NULL); // if there is no vehicle leaving a depot, limit the number of wagons moved immediatelly
@@ @@ -3556,22 +3556,22 @@ static Vehicle *FindTrainCollideEnum(Veh @@
 	if (v->type != VEH_TRAIN) return NULL;
 	/* get first vehicle now to make most usual checks faster */
 	Vehicle *coll = v->First();
 	/* can't collide with own wagons && can't crash in depot && the same height level */
-	if (coll != tcc->v && ((Train *)v)->track != TRACK_BIT_DEPOT && abs(v->z_pos - tcc->v->z_pos) < 6) {
+	if (coll != tcc->v && Train::From(v)->track != TRACK_BIT_DEPOT && abs(v->z_pos - tcc->v->z_pos) < 6) {
 		int x_diff = v->x_pos - tcc->v->x_pos;
 		int y_diff = v->y_pos - tcc->v->y_pos;
 		/* needed to disable possible crash of competitor train in station by building diagonal track at its end */
 		if (x_diff * x_diff + y_diff * y_diff > 25) return NULL;
 		/* crash both trains */
 		tcc->num += TrainCrashed((Train *)tcc->v);
 		tcc->num += TrainCrashed((Train *)coll);
 		tcc->num += TrainCrashed(Train::From(tcc->v));
 		tcc->num += TrainCrashed(Train::From(coll));
 		/* Try to reserve all tiles directly under the crashed trains.
 		 * As there might be more than two trains involved, we have to do that for all vehicles */
 		const Train *u;
 		FOR_ALL_TRAINS(u) {
 			if ((u->vehstatus & VS_CRASHED) && (u->track & TRACK_BIT_DEPOT) == TRACK_BIT_NONE) {
@@ @@ -3629,14 +3629,14 @@ static bool CheckTrainCollision(Train *v @@
 static Vehicle *CheckVehicleAtSignal(Vehicle *v, void *data)
+{
 	DiagDirection exitdir = *(DiagDirection *)data;
 	/* front engine of a train, not inside wormhole or depot, not crashed */
 	if (v->type == VEH_TRAIN && IsFrontEngine(v) && (((Train *)v)->track & TRACK_BIT_MASK) != 0 && !(v->vehstatus & VS_CRASHED)) {
 		if (v->cur_speed <= 5 && TrainExitDir(v->direction, ((Train *)v)->track) == exitdir) return v;
 	if (v->type == VEH_TRAIN && IsFrontEngine(v) && (Train::From(v)->track & TRACK_BIT_MASK) && !(v->vehstatus & VS_CRASHED)) {
 		if (v->cur_speed <= 5 && TrainExitDir(v->direction, Train::From(v)->track) == exitdir) return v;
+	}
 	return NULL;
+}
 static void TrainController(Train *v, Vehicle *nomove)
@@ @@ -3939,17 +3939,17 @@ reverse_train_direction: @@
  */
 static Vehicle *CollectTrackbitsFromCrashedVehiclesEnum(Vehicle *v, void *data)
+{
 	TrackBits *trackbits = (TrackBits *)data;
 	if (v->type == VEH_TRAIN && (v->vehstatus & VS_CRASHED) != 0) {
-		if ((((Train *)v)->track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) {
+		if ((Train::From(v)->track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) {
 			/* Vehicle is inside a wormhole, v->track contains no useful value then. */
 			*trackbits |= DiagDirToDiagTrackBits(GetTunnelBridgeDirection(v->tile));
 		} else {
-			*trackbits |= ((Train *)v)->track;
+			*trackbits |= Train::From(v)->track;
+		}
+	}
 	return NULL;
+}

src/train_gui.cpp

➞

Show inline comments

@@ @@ -77,13 +77,13 @@ void DrawTrainImage(const Vehicle *v, in @@
 	count = (count * 8) / _traininfo_vehicle_width;
 	old_dpi = _cur_dpi;
 	_cur_dpi = &tmp_dpi;
 	do {
-		int width = ((const Train *)v)->tcache.cached_veh_length;
+		int width = Train::From(v)->tcache.cached_veh_length;
 		if (dx + width > 0) {
 			if (dx <= count) {
 				SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 				DrawSprite(v->GetImage(DIR_W), pal, 16 + WagonLengthToPixels(dx), 7 + (is_custom_sprite(RailVehInfo(v->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
 				if (v->index == selection) {
@@ @@ -233,13 +233,13 @@ void DrawTrainDetails(const Vehicle *v, @@
 				int dx = 0;
 				u = v;
 				do {
 					SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 					DrawSprite(u->GetImage(DIR_W), pal, x + WagonLengthToPixels(4 + dx), y + 6 + (is_custom_sprite(RailVehInfo(u->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
-					dx += ((const Train *)u)->tcache.cached_veh_length;
+					dx += Train::From(u)->tcache.cached_veh_length;
 					u = u->Next();
 				} while (u != NULL && IsArticulatedPart(u) && u->cargo_cap == 0);
 				int px = x + WagonLengthToPixels(dx) + 2;
 				int py = y + 2;
 				switch (det_tab) {

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -1382,13 +1382,13 @@ static VehicleEnterTileStatus VehicleEnt @@
 	if (IsTunnel(tile)) {
 		byte fc;
 		DiagDirection vdir;
 		if (v->type == VEH_TRAIN) {
-			Train *t = (Train *)v;
+			Train *t = Train::From(v);
 			fc = (x & 0xF) + (y << 4);
 			vdir = DirToDiagDir(t->direction);
 			if (t->track != TRACK_BIT_WORMHOLE && dir == vdir) {
 				if (IsFrontEngine(t) && fc == _tunnel_fractcoord_1[dir]) {
@@ @@ -1411,13 +1411,13 @@ static VehicleEnterTileStatus VehicleEnt @@
 				t->track = (TrackBits)_exit_tunnel_track[dir];
 				assert(t->track);
 				t->vehstatus &= ~VS_HIDDEN;
 				return VETSB_ENTERED_WORMHOLE;
+			}
 		} else if (v->type == VEH_ROAD) {
-			RoadVehicle *rv = (RoadVehicle *)v;
+			RoadVehicle *rv = RoadVehicle::From(v);
 			fc = (x & 0xF) + (y << 4);
 			vdir = DirToDiagDir(v->direction);
 			/* Enter tunnel? */
 			if (rv->state != RVSB_WORMHOLE && dir == vdir) {
 				if (fc == _tunnel_fractcoord_4[dir] ||
@@ @@ -1461,51 +1461,51 @@ static VehicleEnterTileStatus VehicleEnt @@
 				case DIAGDIR_SE: if ((y & 0xF) != TILE_SIZE - 1) return VETSB_CONTINUE; break;
 				case DIAGDIR_SW: if ((x & 0xF) != TILE_SIZE - 1) return VETSB_CONTINUE; break;
 				case DIAGDIR_NW: if ((y & 0xF) != 0)             return VETSB_CONTINUE; break;
+			}
 			switch (v->type) {
 				case VEH_TRAIN: {
-					Train *t = (Train *)v;
+					Train *t = Train::From(v);
 					t->track = TRACK_BIT_WORMHOLE;
 					ClrBit(t->flags, VRF_GOINGUP);
 					ClrBit(t->flags, VRF_GOINGDOWN);
 				} break;
 				case VEH_ROAD:
-					((RoadVehicle *)v)->state = RVSB_WORMHOLE;
+					RoadVehicle::From(v)->state = RVSB_WORMHOLE;
 					break;
 				case VEH_SHIP:
-					((Ship *)v)->state = TRACK_BIT_WORMHOLE;
+					Ship::From(v)->state = TRACK_BIT_WORMHOLE;
 					break;
 				default: NOT_REACHED();
+			}
 			return VETSB_ENTERED_WORMHOLE;
 		} else if (DirToDiagDir(v->direction) == ReverseDiagDir(dir)) {
 			v->tile = tile;
 			switch (v->type) {
 				case VEH_TRAIN: {
-					Train *t = (Train *)v;
+					Train *t = Train::From(v);
 					if (t->track == TRACK_BIT_WORMHOLE) {
 						t->track = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y);
 						return VETSB_ENTERED_WORMHOLE;
+					}
 				} break;
 				case VEH_ROAD: {
-					RoadVehicle *rv = (RoadVehicle *)v;
+					RoadVehicle *rv = RoadVehicle::From(v);
 					if (rv->state == RVSB_WORMHOLE) {
 						rv->state = _road_exit_tunnel_state[dir];
 						rv->frame = 0;
 						return VETSB_ENTERED_WORMHOLE;
+					}
 				} break;
 				case VEH_SHIP: {
-					Ship *ship = (Ship *)v;
+					Ship *ship = Ship::From(v);
 					if (ship->state == TRACK_BIT_WORMHOLE) {
 						ship->state = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y);
 						return VETSB_ENTERED_WORMHOLE;
+					}
 				} break;

src/vehicle.cpp

➞

Show inline comments

@@ @@ -521,15 +521,15 @@ void Vehicle::PreDestructor() @@
 		DeleteGroupHighlightOfVehicle(this);
 		if (Group::IsValidID(this->group_id)) Group::Get(this->group_id)->num_engines[this->engine_type]--;
 		if (this->IsPrimaryVehicle()) DecreaseGroupNumVehicle(this->group_id);
+	}
-	if (this->type == VEH_ROAD) ClearSlot((RoadVehicle *)this);
+	if (this->type == VEH_ROAD) ClearSlot(RoadVehicle::From(this));
 	if (this->type == VEH_AIRCRAFT && this->IsPrimaryVehicle()) {
-		Aircraft *a = (Aircraft *)this;
+		Aircraft *a = Aircraft::From(this);
 		Station *st = GetTargetAirportIfValid(a);
 		if (st != NULL) {
 			const AirportFTA *layout = st->Airport()->layout;
 			CLRBITS(st->airport_flags, layout[a->previous_pos].block | layout[a->pos].block);
+		}
+	}
@@ @@ -981,30 +981,30 @@ void VehicleEnterDepot(Vehicle *v) @@
 			SetDepotWaypointReservation(v->tile, false);
 			if (_settings_client.gui.show_track_reservation) MarkTileDirtyByTile(v->tile);
 			if (!IsFrontEngine(v)) v = v->First();
 			UpdateSignalsOnSegment(v->tile, INVALID_DIAGDIR, v->owner);
 			v->load_unload_time_rem = 0;
 			ClrBit(((Train *)v)->flags, VRF_TOGGLE_REVERSE);
 			TrainConsistChanged((Train *)v, true);
 			ClrBit(Train::From(v)->flags, VRF_TOGGLE_REVERSE);
 			TrainConsistChanged(Train::From(v), true);
 			break;
 		case VEH_ROAD:
 			InvalidateWindowClasses(WC_ROADVEH_LIST);
 			if (!IsRoadVehFront(v)) v = v->First();
 			break;
 		case VEH_SHIP:
 			InvalidateWindowClasses(WC_SHIPS_LIST);
-			static_cast<Ship*>(v)->state = TRACK_BIT_DEPOT;
+			Ship::From(v)->state = TRACK_BIT_DEPOT;
 			RecalcShipStuff(v);
 			break;
 		case VEH_AIRCRAFT:
 			InvalidateWindowClasses(WC_AIRCRAFT_LIST);
-			HandleAircraftEnterHangar((Aircraft *)v);
+			HandleAircraftEnterHangar(Aircraft::From(v));
 			break;
 		default: NOT_REACHED();
+	}
 	if (v->type != VEH_TRAIN) {
 		/* Trains update the vehicle list when the first unit enters the depot and calls VehicleEnterDepot() when the last unit enters.
@@ @@ -1426,15 +1426,15 @@ SpriteID GetEnginePalette(EngineID engin @@
 	return GetEngineColourMap(engine_type, company, INVALID_ENGINE, NULL);
+}
 SpriteID GetVehiclePalette(const Vehicle *v)
+{
 	if (v->type == VEH_TRAIN) {
-		return GetEngineColourMap(v->engine_type, v->owner, ((const Train *)v)->tcache.first_engine, v);
+		return GetEngineColourMap(v->engine_type, v->owner, Train::From(v)->tcache.first_engine, v);
 	} else if (v->type == VEH_ROAD) {
-		return GetEngineColourMap(v->engine_type, v->owner, ((const RoadVehicle *)v)->rcache.first_engine, v);
+		return GetEngineColourMap(v->engine_type, v->owner, RoadVehicle::From(v)->rcache.first_engine, v);
+	}
 	return GetEngineColourMap(v->engine_type, v->owner, INVALID_ENGINE, v);
+}
@@ @@ -1490,13 +1490,13 @@ void Vehicle::LeaveStation() @@
 		if (IsTileType(this->tile, MP_STATION)) StationAnimationTrigger(st, this->tile, STAT_ANIM_TRAIN_DEPARTS);
 		/* Try to reserve a path when leaving the station as we
 		 * might not be marked as wanting a reservation, e.g.
 		 * when an overlength train gets turned around in a station. */
 		if (UpdateSignalsOnSegment(this->tile, TrackdirToExitdir(this->GetVehicleTrackdir()), this->owner) == SIGSEG_PBS || _settings_game.pf.reserve_paths) {
-			TryPathReserve((Train *)this, true, true);
+			TryPathReserve(Train::From(this), true, true);
+		}
+	}
+}
 void Vehicle::HandleLoading(bool mode)
@@ @@ -1574,13 +1574,13 @@ CommandCost Vehicle::SendToDepot(DoComma @@
 		InvalidateWindowWidget(WC_VEHICLE_VIEW, this->index, VVW_WIDGET_START_STOP_VEH);
 		/* If there is no depot in front, reverse automatically (trains only) */
 		if (this->type == VEH_TRAIN && reverse) DoCommand(this->tile, this->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION);
 		if (this->type == VEH_AIRCRAFT) {
-			Aircraft *a = (Aircraft *)this;
+			Aircraft *a = Aircraft::From(this);
 			if (a->state == FLYING && a->targetairport != destination) {
 				/* The aircraft is now heading for a different hangar than the next in the orders */
 				extern void AircraftNextAirportPos_and_Order(Aircraft *a);
 				AircraftNextAirportPos_and_Order(a);
+			}
+		}
@@ @@ -1744,10 +1744,10 @@ bool CanVehicleUseStation(EngineID engin @@
  * @param v the vehicle to test
  * @param st the station to test for
  * @return true if and only if the vehicle can use this station.
  */
 bool CanVehicleUseStation(const Vehicle *v, const Station *st)
+{
-	if (v->type == VEH_ROAD) return st->GetPrimaryRoadStop((const RoadVehicle *)v) != NULL;
+	if (v->type == VEH_ROAD) return st->GetPrimaryRoadStop(RoadVehicle::From(v)) != NULL;
 	return CanVehicleUseStation(v->engine_type, st);
+}

src/vehicle_base.h

➞

Show inline comments

@@ @@ -570,12 +570,34 @@ struct SpecializedVehicle : public Vehic @@
 	 * @return pointer to vehicle with given index if it's a vehicle of this type
 	 */
 	static FORCEINLINE T *GetIfValid(size_t index)
+	{
 		return IsValidID(index) ? Get(index) : NULL ;
+	}
 	/**
 	 * Converts a Vehicle to SpecializedVehicle with type checking.
 	 * @param v Vehicle pointer
 	 * @return pointer to SpecializedVehicle
 	 */
 	static FORCEINLINE T *From(Vehicle *v)
+	{
 		assert(v->type == Type);
 		return (T *)v;
+	}
 	/**
 	 * Converts a const Vehicle to const SpecializedVehicle with type checking.
 	 * @param v Vehicle pointer
 	 * @return pointer to SpecializedVehicle
 	 */
 	static FORCEINLINE const T *From(const Vehicle *v)
+	{
 		assert(v->type == Type);
 		return (const T *)v;
+	}
 };
 #define FOR_ALL_VEHICLES_OF_TYPE(name, var) FOR_ALL_ITEMS_FROM(name, vehicle_index, var, 0) if (var->type == name::EXPECTED_TYPE)
 /**
  * Disasters, like submarines, skyrangers and their shadows, belong to this class.

src/vehicle_cmd.cpp

➞

Show inline comments

@@ @@ -64,21 +64,21 @@ CommandCost CmdStartStopVehicle(TileInde @@
 	Vehicle *v = Vehicle::GetIfValid(p1);
 	if (v == NULL || !CheckOwnership(v->owner) || !v->IsPrimaryVehicle()) return CMD_ERROR;
 	switch (v->type) {
 		case VEH_TRAIN:
-			if ((v->vehstatus & VS_STOPPED) && ((Train *)v)->tcache.cached_power == 0) return_cmd_error(STR_TRAIN_START_NO_CATENARY);
+			if ((v->vehstatus & VS_STOPPED) && Train::From(v)->tcache.cached_power == 0) return_cmd_error(STR_TRAIN_START_NO_CATENARY);
 			break;
 		case VEH_SHIP:
 		case VEH_ROAD:
 			break;
 		case VEH_AIRCRAFT: {
-			Aircraft *a = (Aircraft *)v;
+			Aircraft *a = Aircraft::From(v);
 			/* cannot stop airplane when in flight, or when taking off / landing */
 			if (a->state >= STARTTAKEOFF && a->state < TERM7) return_cmd_error(STR_ERROR_AIRCRAFT_IS_IN_FLIGHT);
 		} break;
 		default: return CMD_ERROR;
+	}
@@ @@ -149,13 +149,13 @@ CommandCost CmdMassStartStopVehicle(Tile @@
 		const Vehicle *v = list[i];
 		if (!!(v->vehstatus & VS_STOPPED) != start_stop) continue;
 		if (!vehicle_list_window) {
 			if (vehicle_type == VEH_TRAIN) {
-				if (CheckTrainInDepot((const Train *)v, false) == -1) continue;
+				if (CheckTrainInDepot(Train::From(v), false) == -1) continue;
 			} else {
 				if (!(v->vehstatus & VS_HIDDEN)) continue;
+			}
+		}
 		CommandCost ret = DoCommand(tile, v->index, 0, flags, CMD_START_STOP_VEHICLE);
@@ @@ -346,13 +346,13 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
 	 * w is the car/vehicle currently being cloned
 	 * w_rear is the rear end of the cloned train. It's used to add more cars and is only used by trains
 	 */
 	if (!CheckOwnership(v->owner)) return CMD_ERROR;
-	if (v->type == VEH_TRAIN && (!IsFrontEngine(v) || ((Train *)v)->crash_anim_pos >= 4400)) return CMD_ERROR;
+	if (v->type == VEH_TRAIN && (!IsFrontEngine(v) || Train::From(v)->crash_anim_pos >= 4400)) return CMD_ERROR;
 	/* check that we can allocate enough vehicles */
 	if (!(flags & DC_EXEC)) {
 		int veh_counter = 0;
 		do {
 			veh_counter++;
@@ @@ -378,14 +378,14 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
 		total_cost.AddCost(cost);
 		if (flags & DC_EXEC) {
 			w = Vehicle::Get(_new_vehicle_id);
 			if (v->type == VEH_TRAIN && HasBit(((Train *)v)->flags, VRF_REVERSE_DIRECTION)) {
 				SetBit(((Train *)w)->flags, VRF_REVERSE_DIRECTION);
 			if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION)) {
 				SetBit(Train::From(w)->flags, VRF_REVERSE_DIRECTION);
+			}
 			if (v->type == VEH_TRAIN && !IsFrontEngine(v)) {
 				/* this s a train car
 				 * add this unit to the end of the train */
 				CommandCost result = DoCommand(0, (w_rear->index << 16) | w->index, 1, flags, CMD_MOVE_RAIL_VEHICLE);
@@ @@ -400,13 +400,13 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
 				/* this is a front engine or not a train. */
 				w_front = w;
 				w->service_interval = v->service_interval;
+			}
 			w_rear = w; // trains needs to know the last car in the train, so they can add more in next loop
+		}
-	} while (v->type == VEH_TRAIN && (v = GetNextVehicle((Train *)v)) != NULL);
+	} while (v->type == VEH_TRAIN && (v = GetNextVehicle(Train::From(v))) != NULL);
 	if ((flags & DC_EXEC) && v_front->type == VEH_TRAIN) {
 		/* for trains this needs to be the front engine due to the callback function */
 		_new_vehicle_id = w_front->index;
+	}
@@ @@ -434,13 +434,13 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
 				if (w->cargo_type != v->cargo_type || w->cargo_subtype != v->cargo_subtype) {
 					CommandCost cost = DoCommand(0, w->index, v->cargo_type | (v->cargo_subtype << 8) | 1U << 16 , flags, GetCmdRefitVeh(v));
 					if (CmdSucceeded(cost)) total_cost.AddCost(cost);
+				}
 				if (w->type == VEH_TRAIN && EngineHasArticPart(w)) {
-					w = GetNextArticPart((Train *)w);
+					w = GetNextArticPart(Train::From(w));
 				} else if (w->type == VEH_ROAD && RoadVehHasArticPart(w)) {
 					w = w->Next();
 				} else {
 					break;
+				}
 			} else {
@@ @@ -450,22 +450,22 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
 				if (v->cargo_type != initial_cargo && initial_cargo != CT_INVALID) {
 					total_cost.AddCost(GetRefitCost(v->engine_type));
+				}
+			}
 			if (v->type == VEH_TRAIN && EngineHasArticPart(v)) {
-				v = GetNextArticPart((Train *)v);
+				v = GetNextArticPart(Train::From(v));
 			} else if (v->type == VEH_ROAD && RoadVehHasArticPart(v)) {
 				v = v->Next();
 			} else {
 				break;
+			}
 		} while (v != NULL);
 		if ((flags & DC_EXEC) && v->type == VEH_TRAIN) w = GetNextVehicle((Train *)w);
 	} while (v->type == VEH_TRAIN && (v = GetNextVehicle((Train *)v)) != NULL);
 		if ((flags & DC_EXEC) && v->type == VEH_TRAIN) w = GetNextVehicle(Train::From(w));
 	} while (v->type == VEH_TRAIN && (v = GetNextVehicle(Train::From(v))) != NULL);
 	if (flags & DC_EXEC) {
 		/*
 		 * Set the orders of the vehicle. Cannot do it earlier as we need
 		 * the vehicle refitted before doing this, otherwise the moved
 		 * cargo types might not match (passenger vs non-passenger)

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -600,13 +600,13 @@ static int CDECL VehicleReliabilitySorte @@
 /** Sort vehicles by their max speed */
 static int CDECL VehicleMaxSpeedSorter(const Vehicle * const *a, const Vehicle * const *b)
+{
 	int r = 0;
 	if ((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) {
-		r = ((const Train *)(*a))->tcache.cached_max_speed - ((const Train *)(*b))->tcache.cached_max_speed;
+		r = Train::From(*a)->tcache.cached_max_speed - Train::From(*b)->tcache.cached_max_speed;
 	} else {
 		r = (*a)->max_speed - (*b)->max_speed;
+	}
 	return (r != 0) ? r : VehicleNumberSorter(a, b);
+}
@@ @@ -633,19 +633,19 @@ static int CDECL VehicleValueSorter(cons @@
 /** Sort vehicles by their length */
 static int CDECL VehicleLengthSorter(const Vehicle * const *a, const Vehicle * const *b)
+{
 	int r = 0;
 	switch ((*a)->type) {
 		case VEH_TRAIN:
-			r = ((const Train *)(*a))->tcache.cached_total_length - ((const Train *)(*b))->tcache.cached_total_length;
+			r = Train::From(*a)->tcache.cached_total_length - Train::From(*b)->tcache.cached_total_length;
 			break;
 		case VEH_ROAD: {
 			const RoadVehicle *u;
 			for (u = (const RoadVehicle *)*a; u != NULL; u = u->Next()) r += u->rcache.cached_veh_length;
 			for (u = (const RoadVehicle *)*b; u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length;
 			for (u = RoadVehicle::From(*a); u != NULL; u = u->Next()) r += u->rcache.cached_veh_length;
 			for (u = RoadVehicle::From(*b); u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length;
 		} break;
 		default: NOT_REACHED();
+	}
 	return (r != 0) ? r : VehicleNumberSorter(a, b);
+}
@@ @@ -1468,16 +1468,16 @@ struct VehicleDetailsWindow : Window { @@
 		DrawString(2, this->width - 2, 15, STR_VEHICLE_INFO_AGE_RUNNING_COST_YR);
 		/* Draw max speed */
 		switch (v->type) {
 			case VEH_TRAIN:
 				SetDParam(2, v->GetDisplayMaxSpeed());
 				SetDParam(1, ((const Train *)v)->tcache.cached_power);
 				SetDParam(0, ((const Train *)v)->tcache.cached_weight);
 				SetDParam(3, ((const Train *)v)->tcache.cached_max_te / 1000);
 				DrawString(2, this->width - 2, 25, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && ((const Train *)v)->railtype != RAILTYPE_MAGLEV) ?
 				SetDParam(1, Train::From(v)->tcache.cached_power);
 				SetDParam(0, Train::From(v)->tcache.cached_weight);
 				SetDParam(3, Train::From(v)->tcache.cached_max_te / 1000);
 				DrawString(2, this->width - 2, 25, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && Train::From(v)->railtype != RAILTYPE_MAGLEV) ?
 					STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :
 					STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED);
 				break;
 			case VEH_ROAD:
 			case VEH_SHIP:
@@ @@ -1940,25 +1940,25 @@ struct VehicleViewWindow : Window { @@
 			str = STR_VEHICLE_STATUS_CRASHED;
 		} else if (v->type != VEH_AIRCRAFT && v->breakdown_ctr == 1) { // check for aircraft necessary?
 			str = STR_VEHICLE_STATUS_BROKEN_DOWN;
 		} else if (v->vehstatus & VS_STOPPED) {
 			if (v->type == VEH_TRAIN) {
 				if (v->cur_speed == 0) {
-					if (((const Train *)v)->tcache.cached_power == 0) {
+					if (Train::From(v)->tcache.cached_power == 0) {
 						str = STR_TRAIN_NO_POWER;
 					} else {
 						str = STR_VEHICLE_STATUS_STOPPED;
+					}
 				} else {
 					SetDParam(0, v->GetDisplaySpeed());
 					str = STR_TRAIN_STOPPING + _settings_client.gui.vehicle_speed;
+				}
 			} else { // no train
 				str = STR_VEHICLE_STATUS_STOPPED;
+			}
-		} else if (v->type == VEH_TRAIN && HasBit(((const Train *)v)->flags, VRF_TRAIN_STUCK)) {
+		} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK)) {
 			str = STR_TRAIN_STUCK;
 		} else { // vehicle is in a "normal" state, show current order
 			switch (v->current_order.GetType()) {
 				case OT_GOTO_STATION: {
 					SetDParam(0, v->current_order.GetDestination());
 					SetDParam(1, v->GetDisplaySpeed());

src/vehicle_type.h

➞

Show inline comments

@@ @@ -25,12 +25,14 @@ typedef SimpleTinyEnumT<VehicleType, byt @@
 struct Vehicle;
 struct Train;
 struct RoadVehicle;
 struct Ship;
 struct Aircraft;
 struct EffectVehicle;
 struct DisasterVehicle;
 struct BaseVehicle
+{
 	VehicleTypeByte type;    ///< Type of vehicle
 };

src/vehiclelist.cpp

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ void BuildDepotVehicleList(VehicleType t @@
 		if (v->type != type) continue;
 		if (v->tile != tile) continue;
 		switch (type) {
 			case VEH_TRAIN:
 				if (IsArticulatedPart(v) || IsRearDualheaded(v)) continue;
-				if (((const Train *)v)->track != TRACK_BIT_DEPOT) continue;
+				if (Train::From(v)->track != TRACK_BIT_DEPOT) continue;
 				if (wagons != NULL && IsFreeWagon(v->First())) {
 					if (individual_wagons || IsFreeWagon(v)) *wagons->Append() = v;
 					continue;
+				}
 				break;

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -810,28 +810,28 @@ static void FloodVehicle(Vehicle *v) @@
 				case VEH_TRAIN:
 					if (IsFrontEngine(v)) {
 						pass += 4; // driver
 						/* FreeTrainTrackReservation() calls GetVehicleTrackdir() that doesn't like crashed vehicles.
 						 * In this case, v->direction matches v->u.rail.track, so we can do this (it wasn't crashed before) */
 						v->vehstatus &= ~VS_CRASHED;
-						FreeTrainTrackReservation((Train *)v);
+						FreeTrainTrackReservation(Train::From(v));
 						v->vehstatus |= VS_CRASHED;
+					}
-					((Train *)v)->crash_anim_pos = 4000; // max 4440, disappear pretty fast
+					Train::From(v)->crash_anim_pos = 4000; // max 4440, disappear pretty fast
 					InvalidateWindowClassesData(WC_TRAINS_LIST, 0);
 					break;
 				case VEH_ROAD:
 					if (IsRoadVehFront(v)) pass += 1; // driver
-					((RoadVehicle *)v)->crashed_ctr = 2000; // max 2220, disappear pretty fast
+					RoadVehicle::From(v)->crashed_ctr = 2000; // max 2220, disappear pretty fast
 					InvalidateWindowClassesData(WC_ROADVEH_LIST, 0);
 					break;
 				case VEH_AIRCRAFT:
 					pass += 2; // driver
-					((Aircraft *)v)->crashed_counter = 9000; // max 10000, disappear pretty fast
+					Aircraft::From(v)->crashed_counter = 9000; // max 10000, disappear pretty fast
 					InvalidateWindowClassesData(WC_AIRCRAFT_LIST, 0);
 					break;
+			}
 		} else {
 			return;
+		}

src/yapf/follow_track.hpp

➞

Show inline comments

@@ @@ -52,13 +52,13 @@ struct CFollowTrackT @@
+	}
 	FORCEINLINE void Init(const Vehicle *v, RailTypes railtype_override, CPerformanceTimer *pPerf)
+	{
 		assert(!IsRailTT() || (v != NULL && v->type == VEH_TRAIN));
 		m_veh = v;
-		Init(v != NULL ? v->owner : INVALID_OWNER, IsRailTT() && railtype_override == INVALID_RAILTYPES ? ((const Train *)v)->compatible_railtypes : railtype_override, pPerf);
+		Init(v != NULL ? v->owner : INVALID_OWNER, IsRailTT() && railtype_override == INVALID_RAILTYPES ? Train::From(v)->compatible_railtypes : railtype_override, pPerf);
+	}
 	FORCEINLINE void Init(Owner o, RailTypes railtype_override, CPerformanceTimer *pPerf)
+	{
 		assert((!IsRoadTT() || m_veh != NULL) && (!IsRailTT() || railtype_override != INVALID_RAILTYPES));
 		m_veh_owner = o;
@@ @@ -73,13 +73,13 @@ struct CFollowTrackT @@
 		m_railtypes = railtype_override;
+	}
 	FORCEINLINE static TransportType TT() {return Ttr_type_;}
 	FORCEINLINE static bool IsWaterTT() {return TT() == TRANSPORT_WATER;}
 	FORCEINLINE static bool IsRailTT() {return TT() == TRANSPORT_RAIL;}
-	FORCEINLINE bool IsTram() {return IsRoadTT() && HasBit(((const RoadVehicle *)m_veh)->compatible_roadtypes, ROADTYPE_TRAM);}
+	FORCEINLINE bool IsTram() {return IsRoadTT() && HasBit(RoadVehicle::From(m_veh)->compatible_roadtypes, ROADTYPE_TRAM);}
 	FORCEINLINE static bool IsRoadTT() {return TT() == TRANSPORT_ROAD;}
 	FORCEINLINE static bool Allow90degTurns() {return T90deg_turns_allowed_;}
 	FORCEINLINE static bool DoTrackMasking() {return IsRailTT() && Tmask_reserved_tracks;}
 	/** Tests if a tile is a road tile with a single tramtrack (tram can reverse) */
 	FORCEINLINE DiagDirection GetSingleTramBit(TileIndex tile)
@@ @@ -103,13 +103,13 @@ struct CFollowTrackT @@
 	 *  Otherwise returns false if track can't be followed. */
 	inline bool Follow(TileIndex old_tile, Trackdir old_td)
+	{
 		m_old_tile = old_tile;
 		m_old_td = old_td;
 		m_err = EC_NONE;
-		assert(((TrackStatusToTrackdirBits(GetTileTrackStatus(m_old_tile, TT(), IsRoadTT() && m_veh != NULL ? ((const RoadVehicle *)m_veh)->compatible_roadtypes : 0)) & TrackdirToTrackdirBits(m_old_td)) != 0) ||
+		assert(((TrackStatusToTrackdirBits(GetTileTrackStatus(m_old_tile, TT(), IsRoadTT() && m_veh != NULL ? RoadVehicle::From(m_veh)->compatible_roadtypes : 0)) & TrackdirToTrackdirBits(m_old_td)) != 0) ||
 		       (IsTram() && GetSingleTramBit(m_old_tile) != INVALID_DIAGDIR)); // Disable the assertion for single tram bits
 		m_exitdir = TrackdirToExitdir(m_old_td);
 		if (ForcedReverse()) return true;
 		if (!CanExitOldTile()) return false;
 		FollowTileExit();
 		if (!QueryNewTileTrackStatus()) return TryReverse();
@@ @@ -204,13 +204,13 @@ protected: @@
 	FORCEINLINE bool QueryNewTileTrackStatus()
+	{
 		CPerfStart perf(*m_pPerf);
 		if (IsRailTT() && IsPlainRailTile(m_new_tile)) {
 			m_new_td_bits = (TrackdirBits)(GetTrackBits(m_new_tile) * 0x101);
 		} else {
-			m_new_td_bits = TrackStatusToTrackdirBits(GetTileTrackStatus(m_new_tile, TT(), IsRoadTT() && m_veh != NULL ? ((const RoadVehicle *)m_veh)->compatible_roadtypes : 0));
+			m_new_td_bits = TrackStatusToTrackdirBits(GetTileTrackStatus(m_new_tile, TT(), IsRoadTT() && m_veh != NULL ? RoadVehicle::From(m_veh)->compatible_roadtypes : 0));
 			if (IsTram() && m_new_td_bits == 0) {
 				/* GetTileTrackStatus() returns 0 for single tram bits.
 				 * As we cannot change it there (easily) without breaking something, change it here */
 				switch (GetSingleTramBit(m_new_tile)) {
 					case DIAGDIR_NE:

src/yapf/yapf_costrail.hpp

➞

Show inline comments

@@ @@ -244,14 +244,14 @@ public: @@
 	FORCEINLINE int PlatformLengthPenalty(int platform_length)
+	{
 		int cost = 0;
 		const Vehicle *v = Yapf().GetVehicle();
 		assert(v != NULL);
 		assert(v->type == VEH_TRAIN);
 		assert(((const Train *)v)->tcache.cached_total_length != 0);
 		int missing_platform_length = (((const Train *)v)->tcache.cached_total_length + TILE_SIZE - 1) / TILE_SIZE - platform_length;
 		assert(Train::From(v)->tcache.cached_total_length != 0);
 		int missing_platform_length = (Train::From(v)->tcache.cached_total_length + TILE_SIZE - 1) / TILE_SIZE - platform_length;
 		if (missing_platform_length < 0) {
 			/* apply penalty for longer platform than needed */
 			cost += Yapf().PfGetSettings().rail_longer_platform_penalty + Yapf().PfGetSettings().rail_longer_platform_per_tile_penalty * -missing_platform_length;
 		} else if (missing_platform_length > 0) {
 			/* apply penalty for shorter platform than needed */
 			cost += Yapf().PfGetSettings().rail_shorter_platform_penalty + Yapf().PfGetSettings().rail_shorter_platform_per_tile_penalty * missing_platform_length;

src/yapf/yapf_destrail.hpp

➞

Show inline comments

@@ @@ -10,14 +10,14 @@ class CYapfDestinationRailBase @@
 protected:
 	RailTypes m_compatible_railtypes;
 public:
 	void SetDestination(const Vehicle *v, bool override_rail_type = false)
+	{
 		m_compatible_railtypes = ((const Train *)v)->compatible_railtypes;
 		if (override_rail_type) m_compatible_railtypes |= GetRailTypeInfo(((const Train *)v)->railtype)->compatible_railtypes;
 		m_compatible_railtypes = Train::From(v)->compatible_railtypes;
 		if (override_rail_type) m_compatible_railtypes |= GetRailTypeInfo(Train::From(v)->railtype)->compatible_railtypes;
+	}
 	bool IsCompatibleRailType(RailType rt)
+	{
 		return HasBit(m_compatible_railtypes, rt);
+	}
@@ @@ -88,14 +88,14 @@ public: @@
+	}
 	/** Called by YAPF to detect if node ends in the desired destination */
 	FORCEINLINE bool PfDetectDestination(TileIndex tile, Trackdir td)
+	{
 		return
 			IsSafeWaitingPosition((const Train *)Yapf().GetVehicle(), tile, td, true, !TrackFollower::Allow90degTurns()) &&
 			IsWaitingPositionFree((const Train *)Yapf().GetVehicle(), tile, td, !TrackFollower::Allow90degTurns());
 			IsSafeWaitingPosition(Train::From(Yapf().GetVehicle()), tile, td, true, !TrackFollower::Allow90degTurns()) &&
 			IsWaitingPositionFree(Train::From(Yapf().GetVehicle()), tile, td, !TrackFollower::Allow90degTurns());
+	}
 	/** Called by YAPF to calculate cost estimate. Calculates distance to the destination
 	 *  adds it to the actual cost from origin and stores the sum to the Node::m_estimate. */
 	FORCEINLINE bool PfCalcEstimate(Node& n)
+	{

src/yapf/yapf_rail.cpp

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ private: @@
 	Node      *m_res_node;        ///< The reservation target node
 	TileIndex m_res_fail_tile;    ///< The tile where the reservation failed
 	Trackdir  m_res_fail_td;      ///< The trackdir where the reservation failed
 	bool FindSafePositionProc(TileIndex tile, Trackdir td)
+	{
-		if (IsSafeWaitingPosition((const Train *)Yapf().GetVehicle(), tile, td, true, !TrackFollower::Allow90degTurns())) {
+		if (IsSafeWaitingPosition(Train::From(Yapf().GetVehicle()), tile, td, true, !TrackFollower::Allow90degTurns())) {
 			m_res_dest = tile;
 			m_res_dest_td = td;
 			return false;   // Stop iterating segment
+		}
 		return true;
+	}
@@ @@ -146,13 +146,13 @@ public: @@
 			target->tile = m_res_dest;
 			target->trackdir = m_res_dest_td;
 			target->okay = false;
+		}
 		/* Don't bother if the target is reserved. */
-		if (!IsWaitingPositionFree((const Train *)Yapf().GetVehicle(), m_res_dest, m_res_dest_td)) return false;
+		if (!IsWaitingPositionFree(Train::From(Yapf().GetVehicle()), m_res_dest, m_res_dest_td)) return false;
 		for (Node *node = m_res_node; node->m_parent != NULL; node = node->m_parent) {
 			node->IterateTiles(Yapf().GetVehicle(), Yapf(), *this, &CYapfReserveTrack<Types>::ReserveSingleTrack);
 			if (m_res_fail_tile != INVALID_TILE) {
 				/* Reservation failed, undo. */
 				Node *fail_node = m_res_node;
@@ @@ -408,13 +408,13 @@ public: @@
 	FORCEINLINE Trackdir ChooseRailTrack(const Vehicle *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool *path_not_found, bool reserve_track, PBSTileInfo *target)
+	{
 		if (target != NULL) target->tile = INVALID_TILE;
 		/* set origin and destination nodes */
-		PBSTileInfo origin = FollowTrainReservation((const Train *)v);
+		PBSTileInfo origin = FollowTrainReservation(Train::From(v));
 		Yapf().SetOrigin(origin.tile, origin.trackdir, INVALID_TILE, INVALID_TRACKDIR, 1, true);
 		Yapf().SetDestination(v);
 		/* find the best path */
 		bool path_found = Yapf().FindPath(v);
 		if (path_not_found != NULL) {
@@ @@ -533,15 +533,15 @@ Trackdir YapfChooseRailTrack(const Vehic @@
 	return td_ret;
+}
 bool YapfCheckReverseTrain(const Vehicle *vt)
+{
-	const Train *v = (const Train *)vt;
+	const Train *v = Train::From(vt);
 	/* last wagon */
-	const Train *last_veh = (const Train *)GetLastVehicleInChain(v);
+	const Train *last_veh = Train::From(GetLastVehicleInChain(v));
 	/* get trackdirs of both ends */
 	Trackdir td = v->GetVehicleTrackdir();
 	Trackdir td_rev = ReverseTrackdir(last_veh->GetVehicleTrackdir());
 	/* tiles where front and back are */
@@ @@ -599,13 +599,13 @@ bool YapfFindNearestRailDepotTwoWay(cons @@
+{
 	*depot_tile = INVALID_TILE;
 	*reversed = false;
 	const Vehicle *last_veh = GetLastVehicleInChain(v);
-	PBSTileInfo origin = FollowTrainReservation((const Train *)v);
+	PBSTileInfo origin = FollowTrainReservation(Train::From(v));
 	TileIndex last_tile = last_veh->tile;
 	Trackdir td_rev = ReverseTrackdir(last_veh->GetVehicleTrackdir());
 	typedef bool (*PfnFindNearestDepotTwoWay)(const Vehicle*, TileIndex, Trackdir, TileIndex, Trackdir, int, int, TileIndex*, bool*);
 	PfnFindNearestDepotTwoWay pfnFindNearestDepotTwoWay = &CYapfAnyDepotRail1::stFindNearestDepotTwoWay;

src/yapf/yapf_road.cpp

➞

Show inline comments

@@ @@ -296,19 +296,19 @@ public: @@
 			/* choose diagonal trackdir reachable from enterdir */
 			return DiagDirToDiagTrackdir(enterdir);
+		}
 		/* our source tile will be the next vehicle tile (should be the given one) */
 		TileIndex src_tile = tile;
 		/* get available trackdirs on the start tile */
-		TrackdirBits src_trackdirs = TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_ROAD, ((const RoadVehicle *)v)->compatible_roadtypes));
+		TrackdirBits src_trackdirs = TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_ROAD, RoadVehicle::From(v)->compatible_roadtypes));
 		/* select reachable trackdirs only */
 		src_trackdirs &= DiagdirReachesTrackdirs(enterdir);
 		/* get available trackdirs on the destination tile */
 		TileIndex dest_tile = v->dest_tile;
-		TrackdirBits dest_trackdirs = TrackStatusToTrackdirBits(GetTileTrackStatus(dest_tile, TRANSPORT_ROAD, ((const RoadVehicle *)v)->compatible_roadtypes));
+		TrackdirBits dest_trackdirs = TrackStatusToTrackdirBits(GetTileTrackStatus(dest_tile, TRANSPORT_ROAD, RoadVehicle::From(v)->compatible_roadtypes));
 		/* set origin and destination nodes */
 		Yapf().SetOrigin(src_tile, src_trackdirs);
 		Yapf().SetDestination(dest_tile, dest_trackdirs);
 		/* find the best path */
@@ @@ -346,13 +346,13 @@ public: @@
+		}
 		if (!SetOriginFromVehiclePos(v)) return UINT_MAX;
 		/* set destination tile, trackdir
 		 *   get available trackdirs on the destination tile */
-		TrackdirBits dst_td_bits = TrackStatusToTrackdirBits(GetTileTrackStatus(dst_tile, TRANSPORT_ROAD, ((const RoadVehicle *)v)->compatible_roadtypes));
+		TrackdirBits dst_td_bits = TrackStatusToTrackdirBits(GetTileTrackStatus(dst_tile, TRANSPORT_ROAD, RoadVehicle::From(v)->compatible_roadtypes));
 		Yapf().SetDestination(dst_tile, dst_td_bits);
 		/* if path not found - return distance = UINT_MAX */
 		uint dist = UINT_MAX;
 		/* find the best path */
@@ @@ -371,13 +371,13 @@ public: @@
 	/** Return true if the valid origin (tile/trackdir) was set from the current vehicle position. */
 	FORCEINLINE bool SetOriginFromVehiclePos(const Vehicle *v)
+	{
 		/* set origin (tile, trackdir) */
 		TileIndex src_tile = v->tile;
 		Trackdir src_td = v->GetVehicleTrackdir();
-		if ((TrackStatusToTrackdirBits(GetTileTrackStatus(src_tile, TRANSPORT_ROAD, ((const RoadVehicle *)v)->compatible_roadtypes)) & TrackdirToTrackdirBits(src_td)) == 0) {
+		if ((TrackStatusToTrackdirBits(GetTileTrackStatus(src_tile, TRANSPORT_ROAD, RoadVehicle::From(v)->compatible_roadtypes)) & TrackdirToTrackdirBits(src_td)) == 0) {
 			/* sometimes the roadveh is not on the road (it resides on non-existing track)
 			 * how should we handle that situation? */
 			return false;
+		}
 		Yapf().SetOrigin(src_tile, TrackdirToTrackdirBits(src_td));
 		return true;
@@ @@ -468,13 +468,13 @@ uint YapfRoadVehDistanceToTile(const Veh @@
+}
 Depot *YapfFindNearestRoadDepot(const Vehicle *v)
+{
 	TileIndex tile = v->tile;
 	Trackdir trackdir = v->GetVehicleTrackdir();
-	if ((TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_ROAD, ((const RoadVehicle *)v)->compatible_roadtypes)) & TrackdirToTrackdirBits(trackdir)) == 0) {
+	if ((TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_ROAD, RoadVehicle::From(v)->compatible_roadtypes)) & TrackdirToTrackdirBits(trackdir)) == 0) {
 		return NULL;
+	}
 	/* handle the case when our vehicle is already in the depot tile */
 	if (IsRoadDepotTile(tile)) {
 		/* only what we need to return is the Depot* */

0 comments (0 inline, 0 general)