(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.

src/saveload/afterload.cpp

@@ -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);