diff options
Diffstat (limited to 'src/newgrf_engine.cpp')
| -rw-r--r-- | src/newgrf_engine.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 5d01aae42..35f6b44c4 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -481,7 +481,7 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte } return v->grf_cache.position_same_id_length; - case 0x42: // Consist cargo information + case 0x42: { // Consist cargo information if (!HasBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION)) { const Vehicle *u; byte cargo_classes = 0; @@ -531,14 +531,22 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte } } - /* 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); + /* Note: We have to store the untranslated cargotype in the cache as the cache can be read by different NewGRFs, + * which will need different translations */ + v->grf_cache.consist_cargo_information = cargo_classes | (common_cargo_type << 8) | (common_subtype << 16) | (user_def_data << 24); SetBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION); } - return v->grf_cache.consist_cargo_information; + + /* The cargo translation is specific to the accessing GRF, and thus cannot be cached. */ + CargoID common_cargo_type = (v->grf_cache.consist_cargo_information >> 8) & 0xFF; + + /* Unlike everywhere else the cargo translation table is only used since grf version 8, not 7. */ + const GRFFile *grffile = object->grffile; + 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]; + + return (v->grf_cache.consist_cargo_information & 0xFFFF00FF) | common_bitnum << 8; + } case 0x43: // Company information if (!HasBit(v->grf_cache.cache_valid, NCVV_COMPANY_INFORMATION)) { |