From ed36305d290b0869faea70efda832c766e0a8844 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 4 Jan 2025 10:54:14 +0100 Subject: [PATCH] Codechange: prefer SPECSTR_TOWNNAME_START over _ENGLISH --- src/newgrf_townname.cpp | 4 ++-- src/saveload/oldloader_sl.cpp | 2 +- src/townname.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/newgrf_townname.cpp b/src/newgrf_townname.cpp index bf39385af5..e8727adff7 100644 --- a/src/newgrf_townname.cpp +++ b/src/newgrf_townname.cpp @@ -119,6 +119,6 @@ uint16_t GetGRFTownNameType(uint16_t gen) if (gen < t.styles.size()) return gen; gen -= static_cast(t.styles.size()); } - /* Fallback to english original */ - return SPECSTR_TOWNNAME_ENGLISH; + /* Fallback to the first built in town name (English). */ + return SPECSTR_TOWNNAME_START; } diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 2ebd7ed755..870a6e6e25 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -147,7 +147,7 @@ static void FixOldTowns() /* Convert town-names if needed */ for (Town *town : Town::Iterate()) { if (IsInsideMM(town->townnametype, 0x20C1, 0x20C3)) { - town->townnametype = SPECSTR_TOWNNAME_ENGLISH + _settings_game.game_creation.town_name; + town->townnametype = SPECSTR_TOWNNAME_START + _settings_game.game_creation.town_name; town->townnameparts = RemapOldTownName(town->townnameparts, _settings_game.game_creation.town_name); } } diff --git a/src/townname.cpp b/src/townname.cpp index 1a1e16b4c0..943dbfa692 100644 --- a/src/townname.cpp +++ b/src/townname.cpp @@ -31,9 +31,9 @@ TownNameParams::TownNameParams(const Town *t) : type(t->townnametype) { if (t->townnamegrfid != 0 && GetGRFTownName(t->townnamegrfid) == nullptr) { - /* Fallback to english original */ + /* Fallback to the first built in town name (English). */ this->grfid = 0; - this->type = SPECSTR_TOWNNAME_ENGLISH; + this->type = SPECSTR_TOWNNAME_START; return; } }