mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Remove TKM string code.

pull/11914/head
frosch 2024-01-27 22:40:58 +01:00 committed by frosch
parent 9344b50435
commit 28c83089f6
4 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/strgen/strgen_base.cpp
View File

@ -377,34 +377,6 @@ void EmitPlural(Buffer *buffer, char *buf, int)
EmitWordList(buffer, words, nw); 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<const char *> 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) void EmitGender(Buffer *buffer, char *buf, int)
{ {
int argidx = _cur_argidx; int argidx = _cur_argidx;

5
src/strings.cpp
View File

@ -1443,11 +1443,6 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
break; 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} case SCC_COMPANY_NAME: { // {COMPANY}
const Company *c = Company::GetIfValid(args.GetNextParameter<CompanyID>()); const Company *c = Company::GetIfValid(args.GetNextParameter<CompanyID>());
if (c == nullptr) break; if (c == nullptr) break;

1
src/table/control_codes.h
View File

@ -69,7 +69,6 @@ enum StringControlCode {
SCC_UNITS_MONTHS_OR_MINUTES, SCC_UNITS_MONTHS_OR_MINUTES,
SCC_UNITS_YEARS_OR_PERIODS, SCC_UNITS_YEARS_OR_PERIODS,
SCC_UNITS_YEARS_OR_MINUTES, SCC_UNITS_YEARS_OR_MINUTES,
SCC_TIMEKEEPING_MODE_LIST,
SCC_DATE_TINY, SCC_DATE_TINY,
SCC_DATE_SHORT, SCC_DATE_SHORT,

3
src/table/strgen_tables.h
View File

@ -30,7 +30,6 @@ struct CmdStruct {
}; };
extern void EmitSingleChar(Buffer *buffer, char *buf, int value); 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 EmitPlural(Buffer *buffer, char *buf, int value);
extern void EmitGender(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_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}, {"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 {"P", EmitPlural, 0, 0, -1, C_DONTCOUNT}, // plural specifier
{"G", EmitGender, 0, 0, -1, C_DONTCOUNT}, // gender specifier {"G", EmitGender, 0, 0, -1, C_DONTCOUNT}, // gender specifier