equal
deleted
inserted
replaced
452 static uint8 LiveryHelper(EngineID engine, const Vehicle *v) |
452 static uint8 LiveryHelper(EngineID engine, const Vehicle *v) |
453 { |
453 { |
454 const Livery *l; |
454 const Livery *l; |
455 |
455 |
456 if (v == NULL) { |
456 if (v == NULL) { |
457 if (!IsValidPlayer(_current_player)) return 0; |
457 if (!IsValidPlayerID(_current_player)) return 0; |
458 l = GetEngineLivery(engine, _current_player, INVALID_ENGINE, NULL); |
458 l = GetEngineLivery(engine, _current_player, INVALID_ENGINE, NULL); |
459 } else if (v->type == VEH_TRAIN) { |
459 } else if (v->type == VEH_TRAIN) { |
460 l = GetEngineLivery((v->u.rail.first_engine != INVALID_ENGINE && (IsArticulatedPart(v) || UsesWagonOverride(v))) ? v->u.rail.first_engine : v->engine_type, v->owner, v->u.rail.first_engine, v); |
460 l = GetEngineLivery((v->u.rail.first_engine != INVALID_ENGINE && (IsArticulatedPart(v) || UsesWagonOverride(v))) ? v->u.rail.first_engine : v->engine_type, v->owner, v->u.rail.first_engine, v); |
461 } else { |
461 } else { |
462 l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v); |
462 l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v); |