Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r9102) -Codechange: (NewGRF) Apply cargo translation table to vehicle refit masks

Browse Source
This commit is contained in:
peter1138 2007-03-10 16:21:29 +00:00
parent 146e5e12ec
commit 1a7d9dd6c0
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/newgrf.cpp
View File

@ -3757,7 +3757,31 @@ static void CalculateRefitMasks()
uint32 mask = 0; uint32 mask = 0;
uint32 not_mask = 0; uint32 not_mask = 0;
uint32 xor_mask = _engine_info[engine].refit_mask; uint32 xor_mask = 0;
if (_engine_info[engine].refit_mask != 0) {
const GRFFile *file = GetEngineGRF(engine);
if (file != NULL && file->cargo_max != 0) {
/* Apply cargo translation table to the refit mask */
uint num_cargo = min(32, file->cargo_max);
for (uint i = 0; i < num_cargo; i++) {
if (!HASBIT(_engine_info[engine].refit_mask, i)) continue;
CargoID c = GetCargoIDByLabel(file->cargo_list[i]);
if (c == CT_INVALID) continue;
SETBIT(xor_mask, c);
}
} else {
/* No cargo table, so use the cargo bitnum values */
for (CargoID c = 0; c < NUM_CARGO; c++) {
const CargoSpec *cs = GetCargo(c);
if (!cs->IsValid()) continue;
if (HASBIT(_engine_info[engine].refit_mask, cs->bitnum)) SETBIT(xor_mask, c);
}
}
}
if (cargo_allowed[engine] != 0) { if (cargo_allowed[engine] != 0) {
// Build up the list of cargo types from the set cargo classes. // Build up the list of cargo types from the set cargo classes.