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

Cleanup: Use range-based for-loop in group_gui.cpp

pull/8411/head
Bernard Teo 2019-01-11 16:55:32 +08:00 committed by Patric Stout
parent 61fb1cac54
commit a5047b7566
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/group_gui.cpp
View File

@ -565,11 +565,9 @@ public:
case WID_GL_INFO: { case WID_GL_INFO: {
Money this_year = 0; Money this_year = 0;
Money last_year = 0; Money last_year = 0;
uint32 occupancy = 0; uint64 occupancy = 0;
size_t vehicle_count = this->vehicles.size();
for (uint i = 0; i < vehicle_count; i++) { for (const Vehicle * const v : this->vehicles) {
const Vehicle *v = this->vehicles[i];
assert(v->owner == this->owner); assert(v->owner == this->owner);
this_year += v->GetDisplayProfitThisYear(); this_year += v->GetDisplayProfitThisYear();
@ -592,6 +590,7 @@ public:
y += FONT_HEIGHT_NORMAL; y += FONT_HEIGHT_NORMAL;
DrawString(left, right, y, STR_GROUP_OCCUPANCY, TC_BLACK); DrawString(left, right, y, STR_GROUP_OCCUPANCY, TC_BLACK);
const size_t vehicle_count = this->vehicles.size();
if (vehicle_count > 0) { if (vehicle_count > 0) {
SetDParam(0, occupancy / vehicle_count); SetDParam(0, occupancy / vehicle_count);
DrawString(left, right, y, STR_GROUP_OCCUPANCY_VALUE, TC_BLACK, SA_RIGHT); DrawString(left, right, y, STR_GROUP_OCCUPANCY_VALUE, TC_BLACK, SA_RIGHT);