cpp/openttd-patchpack/source File Diff

File diff r12009:28cf5f05f012 → r12010:5513d8f8e97d

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1424,9 +1424,9 @@ SpriteID GetEnginePalette(EngineID engin @@
 SpriteID GetVehiclePalette(const Vehicle *v)
+{
 	if (v->type == VEH_TRAIN) {
 		return GetEngineColourMap(v->engine_type, v->owner, ((Train *)v)->tcache.first_engine, v);
+		return GetEngineColourMap(v->engine_type, v->owner, ((const Train *)v)->tcache.first_engine, v);
 	} else if (v->type == VEH_ROAD) {
 		return GetEngineColourMap(v->engine_type, v->owner, ((RoadVehicle *)v)->rcache.first_engine, v);
+		return GetEngineColourMap(v->engine_type, v->owner, ((const RoadVehicle *)v)->rcache.first_engine, v);
+	}
 	return GetEngineColourMap(v->engine_type, v->owner, INVALID_ENGINE, v);
@@ @@ -1742,7 +1742,7 @@ bool CanVehicleUseStation(EngineID engin @@
  */
 bool CanVehicleUseStation(const Vehicle *v, const Station *st)
+{
 	if (v->type == VEH_ROAD) return st->GetPrimaryRoadStop((RoadVehicle *)v) != NULL;
+	if (v->type == VEH_ROAD) return st->GetPrimaryRoadStop((const RoadVehicle *)v) != NULL;
 	return CanVehicleUseStation(v->engine_type, st);
+}