dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Cache refit capacity callback results which depend only on cargo

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-06 18:34:30 +01:00
parent fcd9137a9f
commit 7a61b5d820
8 changed files with 109 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/engine.cpp
View File

@@ -207,7 +207,19 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16 *mail_capacity) const
/* Check the refit capacity callback if we are not in the default configuration, or if we are using the new multiplier algorithm. */
if (HasBit(this->info.callback_mask, CBM_VEHICLE_REFIT_CAPACITY) &&
(new_multipliers || default_cargo != cargo_type || (v != nullptr && v->cargo_subtype != 0))) {
uint16 callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, this->index, v);
uint16 callback;
if (this->refit_capacity_values != nullptr) {
const EngineRefitCapacityValue *caps = this->refit_capacity_values.get();
while (true) {
if (HasBit(caps->cargoes, cargo_type)) {
callback = caps->capacity;
break;
}
caps++;
}
} else {
callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, this->index, v);
}
if (callback != CALLBACK_FAILED) return callback;
}