mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Iterate group vehicle list for ScriptGroup::GetProfitThisYear and ScriptGroup::GetCurrentUsage

pull/10548/head
SamuXarick 2024-01-01 18:53:12 +00:00
parent 444a90dda8
commit c5dc61e0f8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/api/script_group.cpp
View File

@ -180,10 +180,8 @@
Money profit = 0; Money profit = 0;
for (const Vehicle *v : Vehicle::Iterate()) { const VehicleList &vehicle_list = ::Group::Get(group_id)->statistics.vehicle_list;
if (v->group_id != group_id) continue; for (const Vehicle *v : vehicle_list) {
if (!v->IsPrimaryVehicle()) continue;
profit += v->GetDisplayProfitThisYear(); profit += v->GetDisplayProfitThisYear();
} }
@ -204,10 +202,8 @@
uint32_t occupancy = 0; uint32_t occupancy = 0;
uint32_t vehicle_count = 0; uint32_t vehicle_count = 0;
for (const Vehicle *v : Vehicle::Iterate()) { const VehicleList &vehicle_list = ::Group::Get(group_id)->statistics.vehicle_list;
if (v->group_id != group_id) continue; for (const Vehicle *v : vehicle_list) {
if (!v->IsPrimaryVehicle()) continue;
occupancy += v->trip_occupancy; occupancy += v->trip_occupancy;
vehicle_count++; vehicle_count++;
} }