equal
deleted
inserted
replaced
476 static uint8 LiveryHelper(EngineID engine, const Vehicle *v) |
476 static uint8 LiveryHelper(EngineID engine, const Vehicle *v) |
477 { |
477 { |
478 const Livery *l; |
478 const Livery *l; |
479 |
479 |
480 if (v == NULL) { |
480 if (v == NULL) { |
|
481 if (!IsValidPlayer(_current_player)) return 0; |
481 l = GetEngineLivery(engine, _current_player, INVALID_ENGINE, NULL); |
482 l = GetEngineLivery(engine, _current_player, INVALID_ENGINE, NULL); |
482 } else if (v->type == VEH_TRAIN) { |
483 } else if (v->type == VEH_TRAIN) { |
483 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); |
484 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); |
484 } else { |
485 } else { |
485 l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v); |
486 l = GetEngineLivery(v->engine_type, v->owner, INVALID_ENGINE, v); |