diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index f4d888c2b2..e021a9b1ff 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -377,34 +377,6 @@ void EmitPlural(Buffer *buffer, char *buf, int) EmitWordList(buffer, words, nw); } -/** - * Handle the selection of timekeeping units based on the timekeeping setting. - * This uses the string control character {TKM [value if calendar] [value if wallclock]}, e.g. {TKM month minute}. - * @param buffer The output buffer - * @param buf The input buffer - * @param Unused - */ -void EmitTKM(Buffer* buffer, char* buf, int) -{ - /* The correct number of words is 2, but we'll check for more in case of typos. */ - std::vector words(3, nullptr); - - /* Parse each string. */ - uint nw = 0; - for (nw = 0; nw < 3; nw++) { - words[nw] = ParseWord(&buf); - if (words[nw] == nullptr) break; - } - - /* Warn about the wrong number of parameters. */ - if (nw != 2) { - StrgenFatal("%s: Invalid number of TKM options. Expecting %d, found %d.", _cur_ident, 2, nw); - } - - buffer->AppendUtf8(SCC_TIMEKEEPING_MODE_LIST); - EmitWordList(buffer, words, 2); -} - void EmitGender(Buffer *buffer, char *buf, int) { int argidx = _cur_argidx; diff --git a/src/strings.cpp b/src/strings.cpp index a70ddf57f4..e75e7fac13 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1443,11 +1443,6 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara break; } - case SCC_TIMEKEEPING_MODE_LIST: { // {TKM} - str = ParseStringChoice(str, (uint8_t)TimerGameEconomy::UsingWallclockUnits(_game_mode == GM_MENU), builder); - break; - } - case SCC_COMPANY_NAME: { // {COMPANY} const Company *c = Company::GetIfValid(args.GetNextParameter()); if (c == nullptr) break; diff --git a/src/table/control_codes.h b/src/table/control_codes.h index c79264a265..d2022c3cec 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -69,7 +69,6 @@ enum StringControlCode { SCC_UNITS_MONTHS_OR_MINUTES, SCC_UNITS_YEARS_OR_PERIODS, SCC_UNITS_YEARS_OR_MINUTES, - SCC_TIMEKEEPING_MODE_LIST, SCC_DATE_TINY, SCC_DATE_SHORT, diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index 4685eaa627..0a5bf07531 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -30,7 +30,6 @@ struct CmdStruct { }; extern void EmitSingleChar(Buffer *buffer, char *buf, int value); -extern void EmitTKM(Buffer* buffer, char* buf, int value); extern void EmitPlural(Buffer *buffer, char *buf, int value); extern void EmitGender(Buffer *buffer, char *buf, int value); @@ -94,8 +93,6 @@ static const CmdStruct _cmd_structs[] = { {"UNITS_YEARS_OR_PERIODS", EmitSingleChar, SCC_UNITS_YEARS_OR_PERIODS, 1, 0, C_NONE}, {"UNITS_YEARS_OR_MINUTES", EmitSingleChar, SCC_UNITS_YEARS_OR_MINUTES, 1, 0, C_NONE}, - {"TKM", EmitTKM, 0, 0, -1, C_DONTCOUNT}, // Timekeeping mode string selection, e.g. "{TKM month minute}" - {"P", EmitPlural, 0, 0, -1, C_DONTCOUNT}, // plural specifier {"G", EmitGender, 0, 0, -1, C_DONTCOUNT}, // gender specifier