|
@@ -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
|