# HG changeset patch
# User rubidium42 <rubidium@openttd.org>
# Date 2021-04-27 16:14:44
# Node ID 6dcfc744b37aed252e08dc90a276ec6879c8d73d
# Parent  1405d773e0823ce16915b17f534b327f135cbead

Feature: allow non-ASCII currency separators

diff --git a/src/settings.cpp b/src/settings.cpp
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -563,8 +563,6 @@ static void IniLoadSettings(IniFile *ini
 						*(char**)ptr = p == nullptr ? nullptr : stredup((const char*)p);
 						break;
 
-					case SLE_VAR_CHAR: if (p != nullptr) *(char *)ptr = *(const char *)p; break;
-
 					default: NOT_REACHED();
 				}
 				break;
@@ -716,7 +714,6 @@ static void IniSaveSettings(IniFile *ini
 						}
 						break;
 
-					case SLE_VAR_CHAR: buf[0] = *(char*)ptr; buf[1] = '\0'; break;
 					default: NOT_REACHED();
 				}
 				break;
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -2676,7 +2676,7 @@ struct CustomCurrencyWindow : Window {
 			case WID_CC_SEPARATOR:
 				SetDParamStr(0, _custom_currency.separator);
 				str = STR_JUST_RAW_STRING;
-				len = 1;
+				len = sizeof(_custom_currency.separator) - 1; // Number of characters excluding '\0' termination
 				line = WID_CC_SEPARATOR;
 				break;
 
@@ -2684,7 +2684,7 @@ struct CustomCurrencyWindow : Window {
 			case WID_CC_PREFIX:
 				SetDParamStr(0, _custom_currency.prefix);
 				str = STR_JUST_RAW_STRING;
-				len = 12;
+				len = sizeof(_custom_currency.prefix) - 1; // Number of characters excluding '\0' termination
 				line = WID_CC_PREFIX;
 				break;
 
@@ -2692,7 +2692,7 @@ struct CustomCurrencyWindow : Window {
 			case WID_CC_SUFFIX:
 				SetDParamStr(0, _custom_currency.suffix);
 				str = STR_JUST_RAW_STRING;
-				len = 12;
+				len = sizeof(_custom_currency.suffix) - 1; // Number of characters excluding '\0' termination
 				line = WID_CC_SUFFIX;
 				break;
 
diff --git a/src/table/currency_settings.ini b/src/table/currency_settings.ini
--- a/src/table/currency_settings.ini
+++ b/src/table/currency_settings.ini
@@ -10,7 +10,6 @@ static const SettingDesc _currency_setti
 };
 [templates]
 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_END = SDT_END()
 
@@ -42,9 +41,10 @@ def      = 1
 min      = 0
 max      = UINT16_MAX
 
-[SDT_CHR]
+[SDT_STR]
 base     = CurrencySpec
 var      = separator
+type     = SLE_STRBQ
 def      = "".""
 cat      = SC_BASIC
 
diff --git a/src/table/settings.h.preamble b/src/table/settings.h.preamble
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -107,9 +107,6 @@ static size_t ConvertLandscape(const cha
 #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)
 
-#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)\
 	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)