From af18c30f30d550b98f7fe3dc89c8977a2aeb7f51 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 16 Sep 2010 16:31:57 +0000 Subject: (svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille) --- src/saveload/afterload.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/saveload') diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 61183f30c..348cbb6c6 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2295,6 +2295,19 @@ bool AfterLoadGame() SetWaterClass(t, WATER_CLASS_INVALID); } } + + /* Waypoints with custom name may have a non-unique town_cn, + * renumber those. First set all affected waypoints to the + * highest possible number to get them numbered in the + * order they have in the pool. */ + Waypoint *wp; + FOR_ALL_WAYPOINTS(wp) { + if (wp->name != NULL) wp->town_cn = UINT16_MAX; + } + + FOR_ALL_WAYPOINTS(wp) { + if (wp->name != NULL) MakeDefaultName(wp); + } } /* Road stops is 'only' updating some caches */ -- cgit v1.2.3-54-g00ecf