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

Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops

Browse Source
This commit is contained in:
glx
2019-12-17 21:22:15 +01:00
committed by Niels Martin Hansen
parent 847e5f33d4
commit 0b489f9924
7 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/subsidy_gui.cpp
View File

@@ -42,8 +42,7 @@ struct SubsidyListWindow : Window {
int y = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_SUL_PANEL, WD_FRAMERECT_TOP);
int num = 0;
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (!s->IsAwarded()) {
y--;
if (y == 0) {
@@ -62,7 +61,7 @@ struct SubsidyListWindow : Window {
y -= 2; // "Services already subsidised:"
if (y < 0) return;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (s->IsAwarded()) {
y--;
if (y == 0) {
@@ -110,8 +109,7 @@ struct SubsidyListWindow : Window {
/* Count number of (non) awarded subsidies */
uint num_awarded = 0;
uint num_not_awarded = 0;
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (!s->IsAwarded()) {
num_not_awarded++;
} else {
@@ -159,8 +157,7 @@ struct SubsidyListWindow : Window {
pos++;
uint num = 0;
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (!s->IsAwarded()) {
if (IsInsideMM(pos, 0, cap)) {
/* Displays the two offered towns */
@@ -184,7 +181,7 @@ struct SubsidyListWindow : Window {
pos++;
num = 0;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (s->IsAwarded()) {
if (IsInsideMM(pos, 0, cap)) {
SetupSubsidyDecodeParam(s, true);