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

(svn r16854) -Fix (r2046): savegames from before this version would get the town id as their 'index' (#<num). For stations with custom names that custom name would be dropped and the lowest 6 bits of the StringID would be used for the 'index'. In other words, it resulted in a mess.

This commit is contained in:
rubidium 2009-07-16 22:58:06 +00:00
parent f16314d0cc
commit a007d609af
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/afterload.cpp
View File

@ -424,6 +424,9 @@ bool AfterLoadGame()
}
}
/* Update all waypoints */
if (CheckSavegameVersion(12)) FixOldWaypoints();
if (CheckSavegameVersion(84)) {
FOR_ALL_COMPANIES(c) {
c->name = CopyFromOldName(c->name_1);
@ -526,9 +529,6 @@ bool AfterLoadGame()
}
}
/* Update all waypoints */
if (CheckSavegameVersion(12)) FixOldWaypoints();
/* make sure there is a town in the game */
if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) {
SetSaveLoadError(STR_NO_TOWN_IN_SCENARIO);

4
src/saveload/waypoint_sl.cpp
View File

@ -45,8 +45,8 @@ void FixOldWaypoints()
FOR_ALL_WAYPOINTS(wp) {
wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index;
wp->town_cn = 0;
if (wp->string_id & 0xC000) {
wp->town_cn = wp->string_id & 0x3F;
if ((wp->string_id & 0xC000) == 0xC000) {
wp->town_cn = (wp->string_id >> 8) & 0x3F;
wp->string_id = STR_NULL;
}
}