From c5a43e705c6c3dd769abf28ddc6e2b77fceb0d39 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 4 Apr 2025 19:10:24 +0200 Subject: [PATCH] Codechange: Simplify Original English townname generator. --- src/townname.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/townname.cpp b/src/townname.cpp index 718279de50..ef505a5649 100644 --- a/src/townname.cpp +++ b/src/townname.cpp @@ -230,6 +230,8 @@ static void ReplaceWords(const char *org, const char *rep, StringBuilder &builde */ static void ReplaceEnglishWords(StringBuilder &builder, size_t start, bool original) { + if (original) ReplaceWords("Ce", "Ke", builder, start); + if (original) ReplaceWords("Ci", "Ki", builder, start); ReplaceWords("Cunt", "East", builder, start); ReplaceWords("Slag", "Pits", builder, start); ReplaceWords("Slut", "Edin", builder, start); @@ -265,11 +267,6 @@ static void MakeEnglishOriginalTownName(StringBuilder &builder, uint32_t seed) i = SeedChanceBias(15, std::size(_name_original_english_6), seed, 60); if (i >= 0) builder += _name_original_english_6[i]; - /* Ce, Ci => Ke, Ki */ - if (builder[start] == 'C' && (builder[start + 1] == 'e' || builder[start + 1] == 'i')) { - builder[start] = 'K'; - } - assert(builder.CurrentIndex() - start >= 4); ReplaceEnglishWords(builder, start, true); }