From 665d6bf7f2b3d1833350f79a11c5ed862eabbc65 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 1 Aug 2023 19:06:41 +0100 Subject: [PATCH] Fix duplicate town names when using the many random towns function See: #583 --- src/town_cmd.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 35417a85ab..242e8e9c10 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -2577,6 +2577,11 @@ bool GenerateTowns(TownLayout layout) SetGeneratingWorldProgress(GWP_TOWN, total); + /* Pre-populate the town names list with the names of any towns already on the map */ + for (const Town *town : Town::Iterate()) { + town_names.insert(town->GetCachedName()); + } + /* First attempt will be made at creating the suggested number of towns. * Note that this is really a suggested value, not a required one. * We would not like the system to lock up just because the user wanted 100 cities on a 64*64 map, would we? */