diff options
author | rubidium <rubidium@openttd.org> | 2010-06-23 14:38:17 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2010-06-23 14:38:17 +0000 |
commit | 52154e097c4f6e0e9d03bad83b933b05b6082d16 (patch) | |
tree | 6c439a38376bb38a31b76cd8532f966fbe519f54 /src/saveload/afterload.cpp | |
parent | 9683b8746674af9963fb13f00e020edf1dba91f4 (diff) | |
download | openttd-52154e097c4f6e0e9d03bad83b933b05b6082d16.tar.xz |
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
Diffstat (limited to 'src/saveload/afterload.cpp')
-rw-r--r-- | src/saveload/afterload.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 467e24fa2..dd25705ab 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -431,7 +431,6 @@ bool AfterLoadGame() SetSignalHandlers(); TileIndex map_size = MapSize(); - Company *c; if (CheckSavegameVersion(98)) GamelogOldver(); @@ -500,6 +499,7 @@ bool AfterLoadGame() } if (CheckSavegameVersion(84)) { + Company *c; FOR_ALL_COMPANIES(c) { c->name = CopyFromOldName(c->name_1); if (c->name != NULL) c->name_1 = STR_SV_UNNAMED; @@ -803,6 +803,7 @@ bool AfterLoadGame() /* From version 16.0, we included autorenew on engines, which are now saved, but * of course, we do need to initialize them for older savegames. */ if (CheckSavegameVersion(16)) { + Company *c; FOR_ALL_COMPANIES(c) { c->engine_renew_list = NULL; c->settings.engine_renew = false; @@ -1089,6 +1090,7 @@ bool AfterLoadGame() * replaced, shall keep their old length. In all prior versions, just default * to false */ if (CheckSavegameVersionOldStyle(16, 1)) { + Company *c; FOR_ALL_COMPANIES(c) c->settings.renew_keep_length = false; } @@ -1147,8 +1149,12 @@ bool AfterLoadGame() YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK); - if (CheckSavegameVersion(34)) FOR_ALL_COMPANIES(c) ResetCompanyLivery(c); + if (CheckSavegameVersion(34)) { + Company *c; + FOR_ALL_COMPANIES(c) ResetCompanyLivery(c); + } + Company *c; FOR_ALL_COMPANIES(c) { c->avail_railtypes = GetCompanyRailtypes(c->index); c->avail_roadtypes = GetCompanyRoadtypes(c->index); |