gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18181) -Add: the concept of zero filled numbers to strgen

Browse Source
This commit is contained in:
rubidium 2009-11-19 13:53:54 +00:00
parent 4987d97810
commit 2f0b1ef5f1
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/strings.cpp
View File

@ -185,29 +185,24 @@ void InjectDParam(uint amount)
memmove(_decode_parameters + amount, _decode_parameters, sizeof(_decode_parameters) - amount * sizeof(uint64)); memmove(_decode_parameters + amount, _decode_parameters, sizeof(_decode_parameters) - amount * sizeof(uint64));
} }
static char *FormatNumber(char *buff, int64 number, const char *last, const char *separator) static char *FormatNumber(char *buff, int64 number, const char *last, const char *separator, int zerofill_from = 19)
{ {
uint64 divisor = 10000000000000000000ULL; uint64 divisor = 10000000000000000000ULL;
uint64 quot;
int i;
uint64 tot;
uint64 num;
if (number < 0) { if (number < 0) {
buff += seprintf(buff, last, "-"); buff += seprintf(buff, last, "-");
number = -number; number = -number;
} }
num = number; uint64 num = number;
uint64 tot = 0;
tot = 0; for (int i = 0; i < 20; i++) {
for (i = 0; i < 20; i++) { uint64 quot = 0;
quot = 0;
if (num >= divisor) { if (num >= divisor) {
quot = num / divisor; quot = num / divisor;
num = num % divisor; num = num % divisor;
} }
if (tot |= quot || i == 19) { if (tot |= quot || i >= zerofill_from) {
buff += seprintf(buff, last, "%i", (int)quot); buff += seprintf(buff, last, "%i", (int)quot);
if ((i % 3) == 1 && i != 19) buff = strecpy(buff, separator, last); if ((i % 3) == 1 && i != 19) buff = strecpy(buff, separator, last);
} }
@ -232,6 +227,11 @@ static char *FormatNoCommaNumber(char *buff, int64 number, const char *last)
return FormatNumber(buff, number, last, ""); return FormatNumber(buff, number, last, "");
} }
static char *FormatZerofillNumber(char *buff, int64 number, int64 count, const char *last)
{
return FormatNumber(buff, number, last, "", 20 - count);
}
static char *FormatHexNumber(char *buff, int64 number, const char *last) static char *FormatHexNumber(char *buff, int64 number, const char *last)
{ {
return buff + seprintf(buff, last, "0x%x", (uint32)number); return buff + seprintf(buff, last, "0x%x", (uint32)number);
@ -839,6 +839,11 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
buff = FormatNoCommaNumber(buff, GetInt64(&argv), last); buff = FormatNoCommaNumber(buff, GetInt64(&argv), last);
break; break;
case SCC_ZEROFILL_NUM: { // {ZEROFILL_NUM}
int64 num = GetInt64(&argv);
buff = FormatZerofillNumber(buff, num, GetInt64(&argv), last);
} break;
case SCC_HEX: // {HEX} case SCC_HEX: // {HEX}
buff = FormatHexNumber(buff, GetInt64(&argv), last); buff = FormatHexNumber(buff, GetInt64(&argv), last);
break; break;

1
src/table/control_codes.h
View File

@ -72,6 +72,7 @@ enum StringControlCode {
SCC_STRING, SCC_STRING,
SCC_COMMA, SCC_COMMA,
SCC_NUM, SCC_NUM,
SCC_ZEROFILL_NUM,
SCC_HEX, SCC_HEX,
SCC_BYTES, SCC_BYTES,

1
src/table/strgen_tables.h
View File

@ -99,6 +99,7 @@ static const CmdStruct _cmd_structs[] = {
/* Numbers */ /* Numbers */
{"COMMA", EmitSingleChar, SCC_COMMA, 1, C_NONE}, // Number with comma {"COMMA", EmitSingleChar, SCC_COMMA, 1, C_NONE}, // Number with comma
{"NUM", EmitSingleChar, SCC_NUM, 1, C_NONE}, // Signed number {"NUM", EmitSingleChar, SCC_NUM, 1, C_NONE}, // Signed number
{"ZEROFILL_NUM", EmitSingleChar, SCC_ZEROFILL_NUM, 2, C_NONE}, // Unsigned number with zero fill, e.g. "02". First parameter is number, second minimum length
{"BYTES", EmitSingleChar, SCC_BYTES, 1, C_NONE}, // Unsigned number with "bytes", i.e. "1.02 MiB or 123 KiB" {"BYTES", EmitSingleChar, SCC_BYTES, 1, C_NONE}, // Unsigned number with "bytes", i.e. "1.02 MiB or 123 KiB"
{"CURRENCY", EmitSingleChar, SCC_CURRENCY, 1, C_NONE}, {"CURRENCY", EmitSingleChar, SCC_CURRENCY, 1, C_NONE},