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

(svn r15137) -Fix (r11822)(r14340): signs with sign 'Sign' were lost when converting from TTD savegames

Browse Source
This commit is contained in:
smatz
2009-01-18 16:20:04 +00:00
parent 730ceecb8b
commit 9cc64bfa21
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/saveload/afterload.cpp
View File

@@ -206,14 +206,6 @@ static void UpdateVoidTiles()
for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i);
}
/* since savegame version 6.0 each sign has an "owner", signs without owner (from old games are set to 255) */
static void UpdateSignOwner()
{
Sign *si;
FOR_ALL_SIGNS(si) si->owner = OWNER_NONE;
}
static inline RailType UpdateRailType(RailType rt, RailType min)
{
return rt >= min ? (RailType)(rt + 1): rt;
@@ -351,9 +343,6 @@ bool AfterLoadGame()
/* from version 4.2 of the savegame, currencies are in a different order */
if (CheckSavegameVersionOldStyle(4, 2)) UpdateCurrencies();
/* from version 6.1 of the savegame, signs have an "owner" */
if (CheckSavegameVersionOldStyle(6, 1)) UpdateSignOwner();
/* In old version there seems to be a problem that water is owned by
* OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current
* (4.3) version, so I just check when versions are older, and then
@@ -392,14 +381,6 @@ bool AfterLoadGame()
wp->name = CopyFromOldName(wp->string);
wp->string = STR_EMPTY;
}
for (uint i = 0; i < GetSignPoolSize(); i++) {
/* invalid signs are determined by si->ower == INVALID_COMPANY now */
Sign *si = GetSign(i);
if (!si->IsValid() && si->name != NULL) {
si->owner = OWNER_NONE;
}
}
}
/* From this point the old names array is cleared. */