miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.10.0-beta2

Browse Source
This commit is contained in:
dP
2020-01-06 18:49:34 +03:00
parent 599ccf0c2b
commit c7c3966eec
1366 changed files with 2926 additions and 5639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/subsidy_gui.cpp
+5 -10
View File
@@ -1,5 +1,3 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -44,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) {
@@ -64,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) {
@@ -112,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 {
@@ -161,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 */
@@ -186,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);