mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix format string bugs

This commit is contained in:
IntelOrca 2014-05-31 14:43:29 +01:00
parent 6a1c5fa6eb
commit b1e9c5c786
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/string_ids.c
View File

@ -1085,12 +1085,16 @@ void format_integer(char **dest, int value)
*dest = dst; *dest = dst;
// Right to left if (value == 0) {
while (value > 0) { *dst++ = '0';
digit = value % 10; } else {
value /= 10; // Right to left
while (value > 0) {
digit = value % 10;
value /= 10;
*dst++ = '0' + digit; *dst++ = '0' + digit;
}
} }
finish = dst; finish = dst;
@ -1121,20 +1125,24 @@ void format_comma_separated_integer(char **dest, int value)
*dest = dst; *dest = dst;
// Groups of three digits, right to left if (value == 0) {
groupIndex = 0; *dst++ = '0';
while (value > 0) { } else {
// Append group seperator // Groups of three digits, right to left
if (groupIndex == 3) { groupIndex = 0;
groupIndex = 0; while (value > 0) {
*dst++ = ','; // Append group seperator
if (groupIndex == 3) {
groupIndex = 0;
*dst++ = ',';
}
digit = value % 10;
value /= 10;
*dst++ = '0' + digit;
groupIndex++;
} }
digit = value % 10;
value /= 10;
*dst++ = '0' + digit;
groupIndex++;
} }
finish = dst; finish = dst;
@ -1225,20 +1233,24 @@ void format_currency(char **dest, int value)
*dest = dst; *dest = dst;
// Groups of three digits, right to left if (value == 0) {
groupIndex = 0; *dst++ = '0';
while (value > 0) { } else {
// Append group seperator // Groups of three digits, right to left
if (groupIndex == 3) { groupIndex = 0;
groupIndex = 0; while (value > 0) {
*dst++ = ','; // Append group seperator
if (groupIndex == 3) {
groupIndex = 0;
*dst++ = ',';
}
digit = value % 10;
value /= 10;
*dst++ = '0' + digit;
groupIndex++;
} }
digit = value % 10;
value /= 10;
*dst++ = '0' + digit;
groupIndex++;
} }
finish = dst; finish = dst;
@ -1389,11 +1401,12 @@ void format_string_code(unsigned char format_code, char **dest, char **args)
value = *((uint16*)*args); value = *((uint16*)*args);
*args += 2; *args += 2;
uint16 dateArgs[] = { date_get_year(value), date_get_month(value) }; uint16 dateArgs[] = { date_get_month(value), date_get_year(value) + 1 };
uint16 *dateArgs2 = dateArgs;
char formatString[] = "?, Year ?"; char formatString[] = "?, Year ?";
formatString[0] = FORMAT_MONTH; formatString[0] = FORMAT_MONTH;
formatString[8] = FORMAT_COMMA16; formatString[8] = FORMAT_COMMA16;
format_string_part_from_raw(dest, formatString, (char**)&dateArgs); format_string_part_from_raw(dest, formatString, (char**)&dateArgs2);
break; break;
case FORMAT_MONTH: case FORMAT_MONTH:
// Pop argument // Pop argument