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

6
src/newgrf_engine.cpp
View File

@@ -1162,14 +1162,14 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object,
const Vehicle *v = this->self_scope.v;
if (v == nullptr) {
if (group->num_loading > 0) return group->loading[0];
if (group->num_loaded > 0) return group->loaded[0];
if (!group->loading.empty()) return group->loading[0];
if (!group->loaded.empty()) return group->loaded[0];
return nullptr;
}
bool in_motion = !v->First()->current_order.IsType(OT_LOADING);
uint totalsets = in_motion ? group->num_loaded : group->num_loading;
uint totalsets = in_motion ? (uint)group->loaded.size() : (uint)group->loading.size();
if (totalsets == 0) return nullptr;