petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r8314) -Fix

Browse Source 
-Codechange: Move the railtype from EngineInfo to RailVehicleInfo, because having a railtype for non-rail vehicles isn't that useful
This commit is contained in:
tron
2007-01-21 16:08:18 +00:00
parent 9e9d5905f3
commit bc523186e0
5 changed files with 407 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle.cpp
View File

@@ -2843,12 +2843,12 @@ static SpriteID GetEngineColourMap(EngineID engine_type, PlayerID player, Engine
/* Determine the livery scheme to use */
switch (GetEngine(engine_type)->type) {
case VEH_Train: {
switch (_engine_info[engine_type].railtype) {
const RailVehicleInfo *rvi = RailVehInfo(engine_type);
switch (rvi->railtype) {
case RAILTYPE_RAIL:
case RAILTYPE_ELECTRIC:
{
const RailVehicleInfo *rvi = RailVehInfo(engine_type);
if (cargo_type == CT_INVALID) cargo_type = rvi->cargo_type;
if (rvi->flags & RVI_WAGON) {
if (cargo_type == CT_PASSENGERS || cargo_type == CT_MAIL || cargo_type == CT_VALUABLES) {