mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r23143) -Change: [NewGRF v8] Return the translated cargobit in vehicle var 42.

This commit is contained in:
frosch 2011-11-08 17:25:32 +00:00
parent d8f8909f85
commit 449d679230
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_engine.cpp
View File

@ -531,7 +531,10 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte
}
}
uint8 common_bitnum = (common_cargo_type == CT_INVALID ? 0xFF : CargoSpec::Get(common_cargo_type)->bitnum);
/* Unlike everywhere else the cargo translation table is only used since grf version 8, not 7. */
const GRFFile *grffile = v->GetGRF();
uint8 common_bitnum = (common_cargo_type == CT_INVALID) ? 0xFF :
(grffile->grf_version < 8) ? CargoSpec::Get(common_cargo_type)->bitnum : grffile->cargo_map[common_cargo_type];
v->grf_cache.consist_cargo_information = cargo_classes | (common_bitnum << 8) | (common_subtype << 16) | (user_def_data << 24);
SetBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION);
}