mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r1255) Renamed "postfix" to "suffix", for strings and variable names
This commit is contained in:
parent
60052ffb45
commit
58c153b9ac
|
@ -2739,7 +2739,7 @@ STR_CURRENCY_WINDOW :{WHITE}Custom currency
|
|||
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = {POUNDSIGN} {COMMA16}
|
||||
STR_CURRENCY_SEPARATOR :{LTBLUE}Separator:
|
||||
STR_CURRENCY_PREFIX :{LTBLUE}Prefix:
|
||||
STR_CURRENCY_POSTFIX :{LTBLUE}Postfix:
|
||||
STR_CURRENCY_SUFFIX :{LTBLUE}Suffix:
|
||||
STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Switch to Euro: {ORANGE}{INT32}
|
||||
STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Switch to Euro: {ORANGE}never
|
||||
STR_CURRENCY_PREVIEW :{LTBLUE}Preview: {ORANGE}{CURRENCY}
|
||||
|
|
|
@ -910,8 +910,8 @@ static const SettingDesc currency_settings[] = {
|
|||
{"rate", SDT_UINT16, (void*)1, &_currency_specs[23].rate, NULL},
|
||||
{"separator", SDT_STRINGQUOT | (2) << 16, ".", &_currency_specs[23].separator, NULL},
|
||||
{"to_euro", SDT_UINT16, (void*)0, &_currency_specs[23].to_euro, NULL},
|
||||
{"pre", SDT_STRINGQUOT | (16) << 16, NULL, &_currency_specs[23].pre, NULL},
|
||||
{"post", SDT_STRINGQUOT | (16) << 16, " credits", &_currency_specs[23].post, NULL},
|
||||
{"prefix", SDT_STRINGQUOT | (16) << 16, NULL, &_currency_specs[23].prefix, NULL},
|
||||
{"suffix", SDT_STRINGQUOT | (16) << 16, " credits", &_currency_specs[23].suffix, NULL},
|
||||
{NULL, 0, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
|
|
|
@ -1308,15 +1308,15 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e)
|
|||
// prefix
|
||||
DrawFrameRect(10, y+1, 29, y+9, 0, ((clk >> (i*2)) & 0x03)?0x20:0x00);
|
||||
x = DrawString(x, y + 1, STR_CURRENCY_PREFIX, 0);
|
||||
DoDrawString(_currency_specs[23].pre, x + 4, y + 1, 6);
|
||||
DoDrawString(_currency_specs[23].prefix, x + 4, y + 1, 6);
|
||||
x = 35;
|
||||
y+=12;
|
||||
i++;
|
||||
|
||||
// postfix
|
||||
// suffix
|
||||
DrawFrameRect(10, y+1, 29, y+9, 0, ((clk >> (i*2)) & 0x03)?0x20:0x00);
|
||||
x = DrawString(x, y + 1, STR_CURRENCY_POSTFIX, 0);
|
||||
DoDrawString(_currency_specs[23].post, x + 4, y + 1, 6);
|
||||
x = DrawString(x, y + 1, STR_CURRENCY_SUFFIX, 0);
|
||||
DoDrawString(_currency_specs[23].suffix, x + 4, y + 1, 6);
|
||||
x = 35;
|
||||
y+=12;
|
||||
i++;
|
||||
|
@ -1369,14 +1369,14 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e)
|
|||
case 2: // prefix
|
||||
if ( IS_INT_INSIDE(x, 10, 30) ) // clicked button
|
||||
WP(w,def_d).data_1 = (1 << (line * 2 + 1));
|
||||
str = AllocateName(_currency_specs[23].pre, 0);
|
||||
str = AllocateName(_currency_specs[23].prefix, 0);
|
||||
len = 12;
|
||||
edittext = true;
|
||||
break;
|
||||
case 3: // postfix
|
||||
case 3: // suffix
|
||||
if ( IS_INT_INSIDE(x, 10, 30) ) // clicked button
|
||||
WP(w,def_d).data_1 = (1 << (line * 2 + 1));
|
||||
str = AllocateName(_currency_specs[23].post, 0);
|
||||
str = AllocateName(_currency_specs[23].suffix, 0);
|
||||
len = 12;
|
||||
edittext = true;
|
||||
break;
|
||||
|
@ -1431,10 +1431,10 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e)
|
|||
ttd_strlcpy(str_separator, b, 16);
|
||||
break;
|
||||
case 2:
|
||||
ttd_strlcpy(_currency_specs[23].pre, b, 16);
|
||||
ttd_strlcpy(_currency_specs[23].prefix, b, 16);
|
||||
break;
|
||||
case 3:
|
||||
ttd_strlcpy(_currency_specs[23].post, b, 16);
|
||||
ttd_strlcpy(_currency_specs[23].suffix, b, 16);
|
||||
break;
|
||||
case 4:
|
||||
val = atoi(b);
|
||||
|
|
12
strings.c
12
strings.c
|
@ -276,9 +276,9 @@ static byte *FormatGenericCurrency(byte *buff, const CurrencySpec *spec, int64 n
|
|||
// convert from negative
|
||||
if (number < 0) { *buff++ = '-'; number = -number; }
|
||||
|
||||
// add pre part
|
||||
s = spec->pre;
|
||||
while (s != spec->pre + lengthof(spec->pre) && (c=*s++)) *buff++ = c;
|
||||
// add prefix part
|
||||
s = spec->prefix;
|
||||
while (s != spec->prefix + lengthof(spec->prefix) && (c=*s++)) *buff++ = c;
|
||||
|
||||
// for huge numbers, compact the number into k or M
|
||||
if (compact) {
|
||||
|
@ -303,9 +303,9 @@ static byte *FormatGenericCurrency(byte *buff, const CurrencySpec *spec, int64 n
|
|||
|
||||
if (compact) *buff++ = compact;
|
||||
|
||||
// add post part
|
||||
s = spec->post;
|
||||
while (s != spec->post + lengthof(spec->post) && (c=*s++)) *buff++ = c;
|
||||
// add suffix part
|
||||
s = spec->suffix;
|
||||
while (s != spec->suffix + lengthof(spec->suffix) && (c=*s++)) *buff++ = c;
|
||||
|
||||
return buff;
|
||||
}
|
||||
|
|
|
@ -45,8 +45,8 @@ typedef struct {
|
|||
uint16 rate;
|
||||
char separator;
|
||||
uint16 to_euro;
|
||||
char pre[16];
|
||||
char post[16];
|
||||
char prefix[16];
|
||||
char suffix[16];
|
||||
} CurrencySpec;
|
||||
|
||||
VARDEF CurrencySpec _currency_specs[24];
|
||||
|
|
Loading…
Reference in New Issue