|
@@ -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, ((Train *)v)->tcache.first_engine, v);
|
|
|
l = GetEngineLivery(v->engine_type, v->owner, ((const Train *)v)->tcache.first_engine, v);
|
|
|
} else if (v->type == VEH_ROAD) {
|
|
|
l = GetEngineLivery(v->engine_type, v->owner, ((RoadVehicle *)v)->rcache.first_engine, v);
|
|
|
l = GetEngineLivery(v->engine_type, v->owner, ((const RoadVehicle *)v)->rcache.first_engine, v);
|
|
|
} else {
|
|
|
l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v);
|
|
|
}
|
|
|
|
|
|
return l->colour1 + l->colour2 * 16;
|
|
|
}
|
|
@@ -533,13 +533,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 |= ((Train *)u)->tcache.user_def_data;
|
|
|
if (v->type == VEH_TRAIN) user_def_data |= ((const Train *)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]++;
|
|
@@ -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 ? ((Train *)v)->tcache.cached_override : GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((Train *)v)->tcache.first_engine);
|
|
|
group = use_cache ? ((const Train *)v)->tcache.cached_override : GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((const Train *)v)->tcache.first_engine);
|
|
|
if (group != NULL) return group;
|
|
|
} else if (v->type == VEH_ROAD) {
|
|
|
group = GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((RoadVehicle *)v)->rcache.first_engine);
|
|
|
group = GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, ((const RoadVehicle *)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 ((Train *)v)->tcache.cached_override != NULL;
|
|
|
return ((const Train *)v)->tcache.cached_override != NULL;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Evaluate a newgrf callback for vehicles
|
|
|
* @param callback The callback to evalute
|
|
|
* @param param1 First parameter of the callback
|