(svn r16711) -Codechange: use FOR_ALL_SUBSIDIES macro when iterating over all subsidies

This commit is contained in:
smatz
2009-07-01 17:43:26 +00:00
parent 023f78b5ff
commit f4d0d94184
7 changed files with 37 additions and 42 deletions

View File

@@ -327,10 +327,9 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
if (new_owner == INVALID_OWNER) {
Subsidy *s;
for (s = _subsidies; s != endof(_subsidies); s++) {
if (s->cargo_type != CT_INVALID && s->age >= 12) {
if (Station::Get(s->to)->owner == old_owner) s->cargo_type = CT_INVALID;
FOR_ALL_SUBSIDIES(s) {
if (s->age >= 12 && Station::Get(s->to)->owner == old_owner) {
s->cargo_type = CT_INVALID;
}
}
}