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

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

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

4
src/saveload/afterload.cpp
View File

@@ -1916,8 +1916,8 @@ bool AfterLoadGame()
}
/* Delete invalid subsidies possibly present in old versions (but converted to new savegame) */
for (Subsidy *s = _subsidies; s < endof(_subsidies); s++) {
if (s->cargo_type == CT_INVALID) continue;
Subsidy *s;
FOR_ALL_SUBSIDIES(s) {
if (s->age >= 12) {
/* Station -> Station */
const Station *from = Station::GetIfValid(s->from);

11
src/saveload/subsidy_sl.cpp
View File

@@ -19,15 +19,10 @@ static const SaveLoad _subsidies_desc[] = {
void Save_SUBS()
{
int i;
Subsidy *s;
for (i = 0; i != lengthof(_subsidies); i++) {
s = &_subsidies[i];
if (s->cargo_type != CT_INVALID) {
SlSetArrayIndex(i);
SlObject(s, _subsidies_desc);
}
FOR_ALL_SUBSIDIES(s) {
SlSetArrayIndex(s - _subsidies);
SlObject(s, _subsidies_desc);
}
}