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

Cleanup: Use std::vector in RealSpriteGroup.

Browse Source 
(cherry picked from commit f785a70a2b)
This commit is contained in:
Peter Nelson
2021-05-01 23:58:18 +01:00
committed by Jonathan G Rennison
parent d4c466200f
commit d3b9d19c5a
11 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_station.cpp
View File

@@ -523,13 +523,13 @@ uint32 Waypoint::GetNewGRFVariable(const ResolverObject &object, byte variable,
cargo = std::min(0xfffu, cargo);
if (cargo > this->station_scope.statspec->cargo_threshold) {
if (group->num_loading > 0) {
uint set = ((cargo - this->station_scope.statspec->cargo_threshold) * group->num_loading) / (4096 - this->station_scope.statspec->cargo_threshold);
if (!group->loading.empty()) {
uint set = ((cargo - this->station_scope.statspec->cargo_threshold) * (uint)group->loading.size()) / (4096 - this->station_scope.statspec->cargo_threshold);
return group->loading[set];
}
} else {
if (group->num_loaded > 0) {
uint set = (cargo * group->num_loaded) / (this->station_scope.statspec->cargo_threshold + 1);
if (!group->loaded.empty()) {
uint set = (cargo * (uint)group->loaded.size()) / (this->station_scope.statspec->cargo_threshold + 1);
return group->loaded[set];
}
}