mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into gfx_unstable

Browse Source
This commit is contained in:
IntelOrca
2014-05-31 16:48:16 +01:00
parent 416be95811 b5575d31eb
commit 35c8f64fff
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/string_ids.c
View File

@@ -1387,6 +1387,7 @@ void format_string_code(unsigned char format_code, char **dest, char **args)
*args += 2;
format_string_part(dest, value, args);
(*dest)--;
break;
case FORMAT_STRING:
// Pop argument
@@ -1538,7 +1539,7 @@ void format_string_part(char **dest, rct_string_id format, char **args)
// args += (format & 0xC00) >> 9;
format &= ~0xC00;
strcpy(*dest, RCT2_ADDRESS(0x135A8F4 + (format * 32), char));
*dest = strchr(*dest, 0);
*dest = strchr(*dest, 0) + 1;
} else if (format < 0xE000) {
// Real name
format -= -0xA000;
@@ -1546,7 +1547,7 @@ void format_string_part(char **dest, rct_string_id format, char **args)
real_names[format % countof(real_names)],
real_name_initials[(format >> 10) % countof(real_name_initials)]
);
*dest = strchr(*dest, 0);
*dest = strchr(*dest, 0) + 1;
} else {
// ?
RCT2_CALLPROC_EBPSAFE(RCT2_ADDRESS(0x0095AFB8, uint32)[format]);