mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: DMU/EMU livery should apply to passenger carriages with DMU/EMU engines.

pull/7163/head
Peter Nelson 2019-02-02 15:12:33 +00:00 committed by PeterN
parent c9d801a98d
commit e8f1c446a6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vehicle.cpp
View File

@ -1813,11 +1813,12 @@ LiveryScheme GetEngineLiveryScheme(EngineID engine_type, EngineID parent_engine_
if (parent_engine_type == INVALID_ENGINE) { if (parent_engine_type == INVALID_ENGINE) {
return LS_PASSENGER_WAGON_STEAM; return LS_PASSENGER_WAGON_STEAM;
} else { } else {
bool is_mu = HasBit(EngInfo(parent_engine_type)->misc_flags, EF_RAIL_IS_MU);
switch (RailVehInfo(parent_engine_type)->engclass) { switch (RailVehInfo(parent_engine_type)->engclass) {
default: NOT_REACHED(); default: NOT_REACHED();
case EC_STEAM: return LS_PASSENGER_WAGON_STEAM; case EC_STEAM: return LS_PASSENGER_WAGON_STEAM;
case EC_DIESEL: return LS_PASSENGER_WAGON_DIESEL; case EC_DIESEL: return is_mu ? LS_DMU : LS_PASSENGER_WAGON_DIESEL;
case EC_ELECTRIC: return LS_PASSENGER_WAGON_ELECTRIC; case EC_ELECTRIC: return is_mu ? LS_EMU : LS_PASSENGER_WAGON_ELECTRIC;
case EC_MONORAIL: return LS_PASSENGER_WAGON_MONORAIL; case EC_MONORAIL: return LS_PASSENGER_WAGON_MONORAIL;
case EC_MAGLEV: return LS_PASSENGER_WAGON_MAGLEV; case EC_MAGLEV: return LS_PASSENGER_WAGON_MAGLEV;
} }