mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/economy.cpp
View File

@ -345,8 +345,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
Company::Get(old_owner)->money = UINT64_MAX >> 2; // jackpot ;p
}
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
if (s->awarded == old_owner) {
if (new_owner == INVALID_OWNER) {
delete s;

3
src/saveload/afterload.cpp
View File

@ -2219,8 +2219,7 @@ bool AfterLoadGame()
if (IsSavegameVersionBefore(SLV_125)) {
/* Convert old subsidies */
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
if (s->remaining < 12) {
/* Converting nonawarded subsidy */
s->remaining = 12 - s->remaining; // convert "age" to "remaining"

3
src/saveload/subsidy_sl.cpp
View File

@ -29,8 +29,7 @@ static const SaveLoad _subsidies_desc[] = {
static void Save_SUBS()
{
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
SlSetArrayIndex(s->index);
SlObject(s, _subsidies_desc);
}

3
src/script/api/script_subsidylist.cpp
View File

@ -15,8 +15,7 @@
ScriptSubsidyList::ScriptSubsidyList()
{
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
this->AddItem(s->index);
}
}

18
src/subsidy.cpp
View File

@ -135,8 +135,7 @@ void RebuildSubsidisedSourceAndDestinationCache()
for (Industry *i : Industry::Iterate()) i->part_of_subsidy = POS_NONE;
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
SetPartOfSubsidyFlag(s->src_type, s->src, POS_SRC);
SetPartOfSubsidyFlag(s->dst_type, s->dst, POS_DST);
}
@ -151,8 +150,7 @@ void DeleteSubsidyWith(SourceType type, SourceID index)
{
bool dirty = false;
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
if ((s->src_type == type && s->src == index) || (s->dst_type == type && s->dst == index)) {
delete s;
dirty = true;
@ -176,8 +174,7 @@ void DeleteSubsidyWith(SourceType type, SourceID index)
*/
static bool CheckSubsidyDuplicate(CargoID cargo, SourceType src_type, SourceID src, SourceType dst_type, SourceID dst)
{
const Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
if (s->cargo_type == cargo &&
s->src_type == src_type && s->src == src &&
s->dst_type == dst_type && s->dst == dst) {
@ -471,8 +468,7 @@ void SubsidyMonthlyLoop()
{
bool modified = false;
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
if (--s->remaining == 0) {
if (!s->IsAwarded()) {
Pair reftype = SetupSubsidyDecodeParam(s, true);
@ -564,8 +560,7 @@ bool CheckSubsidised(CargoID cargo_type, CompanyID company, SourceType src_type,
* which are destination of subsidised path. Do that only if needed */
std::vector<const Town *> towns_near;
if (!st->rect.IsEmpty()) {
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (const Subsidy *s : Subsidy::Iterate()) {
/* Don't create the cache if there is no applicable subsidy with town as destination */
if (s->dst_type != ST_TOWN) continue;
if (s->cargo_type != cargo_type || s->src_type != src_type || s->src != src) continue;
@ -585,8 +580,7 @@ bool CheckSubsidised(CargoID cargo_type, CompanyID company, SourceType src_type,
/* Check if there's a (new) subsidy that applies. There can be more subsidies triggered by this delivery!
* Think about the case that subsidies are A->B and A->C and station has both B and C in its catchment area */
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
for (Subsidy *s : Subsidy::Iterate()) {
if (s->cargo_type == cargo_type && s->src_type == src_type && s->src == src && (!s->IsAwarded() || s->awarded == company)) {
switch (s->dst_type) {
case ST_INDUSTRY:

3
src/subsidy_base.h
View File

@ -58,7 +58,4 @@ static const uint SUBSIDY_CARGO_MIN_POPULATION = 900; ///< Min. population of de
static const uint SUBSIDY_MAX_PCT_TRANSPORTED = 42; ///< Subsidy will be created only for towns/industries with less % transported
static const uint SUBSIDY_MAX_DISTANCE = 70; ///< Max. length of subsidised route (DistanceManhattan)
#define FOR_ALL_SUBSIDIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Subsidy, subsidy_index, var, start)
#define FOR_ALL_SUBSIDIES(var) FOR_ALL_SUBSIDIES_FROM(var, 0)
#endif /* SUBSIDY_BASE_H */

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);