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

Feature: allow non-ASCII currency separators

pull/9112/head
rubidium42 2021-04-27 18:14:44 +02:00 committed by rubidium42
parent 4880ec29e4
commit b54d8a49fb
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/settings.cpp
View File

@ -563,8 +563,6 @@ static void IniLoadSettings(IniFile *ini, const SettingDesc *sd, const char *grp
*(char**)ptr = p == nullptr ? nullptr : stredup((const char*)p); *(char**)ptr = p == nullptr ? nullptr : stredup((const char*)p);
break; break;
case SLE_VAR_CHAR: if (p != nullptr) *(char *)ptr = *(const char *)p; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
break; break;
@ -716,7 +714,6 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
} }
break; break;
case SLE_VAR_CHAR: buf[0] = *(char*)ptr; buf[1] = '\0'; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
break; break;

6
src/settings_gui.cpp
View File

@ -2676,7 +2676,7 @@ struct CustomCurrencyWindow : Window {
case WID_CC_SEPARATOR: case WID_CC_SEPARATOR:
SetDParamStr(0, _custom_currency.separator); SetDParamStr(0, _custom_currency.separator);
str = STR_JUST_RAW_STRING; str = STR_JUST_RAW_STRING;
len = 1; len = sizeof(_custom_currency.separator) - 1; // Number of characters excluding '\0' termination
line = WID_CC_SEPARATOR; line = WID_CC_SEPARATOR;
break; break;
@ -2684,7 +2684,7 @@ struct CustomCurrencyWindow : Window {
case WID_CC_PREFIX: case WID_CC_PREFIX:
SetDParamStr(0, _custom_currency.prefix); SetDParamStr(0, _custom_currency.prefix);
str = STR_JUST_RAW_STRING; str = STR_JUST_RAW_STRING;
len = 12; len = sizeof(_custom_currency.prefix) - 1; // Number of characters excluding '\0' termination
line = WID_CC_PREFIX; line = WID_CC_PREFIX;
break; break;
@ -2692,7 +2692,7 @@ struct CustomCurrencyWindow : Window {
case WID_CC_SUFFIX: case WID_CC_SUFFIX:
SetDParamStr(0, _custom_currency.suffix); SetDParamStr(0, _custom_currency.suffix);
str = STR_JUST_RAW_STRING; str = STR_JUST_RAW_STRING;
len = 12; len = sizeof(_custom_currency.suffix) - 1; // Number of characters excluding '\0' termination
line = WID_CC_SUFFIX; line = WID_CC_SUFFIX;
break; break;

4
src/table/currency_settings.ini
View File

@ -10,7 +10,6 @@ static const SettingDesc _currency_settings[] = {
}; };
[templates] [templates]
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup),
SDT_CHR = SDT_CHR($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup),
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup),
SDT_END = SDT_END() SDT_END = SDT_END()
@ -42,9 +41,10 @@ def = 1
min = 0 min = 0
max = UINT16_MAX max = UINT16_MAX
[SDT_CHR] [SDT_STR]
base = CurrencySpec base = CurrencySpec
var = separator var = separator
type = SLE_STRBQ
def = ""."" def = "".""
cat = SC_BASIC cat = SC_BASIC

3
src/table/settings.h.preamble
View File

@ -107,9 +107,6 @@ static size_t ConvertLandscape(const char *value);
#define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat, extra, startup)\ #define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat, extra, startup)\
SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, sizeof(((base*)8)->var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat, extra, startup) SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, sizeof(((base*)8)->var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat, extra, startup)
#define SDT_CHR(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat, extra, startup)\
SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat, extra, startup)
#define SDT_OMANY(base, var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, load, cat, extra, startup)\ #define SDT_OMANY(base, var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, load, cat, extra, startup)\
SDT_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, load, from, to, cat, extra, startup) SDT_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, load, from, to, cat, extra, startup)