1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00

Integrate user strings

This commit is contained in:
Ted John
2016-09-10 23:56:50 +01:00
parent 04af8fcd17
commit 4ec6b85ff7
3 changed files with 3 additions and 4 deletions

View File

@@ -1106,7 +1106,7 @@ void format_string_part(utf8 **dest, rct_string_id format, char **args)
*args += (format & 0xC00) >> 9;
format &= ~0xC00;
strcpy(*dest, RCT2_ADDRESS(0x135A8F4 + (format * 32), char));
safe_strcpy(*dest, &gUserStrings[format * 32], 32);
*dest = strchr(*dest, 0) + 1;
} else if (format < 0xE000) {
// Real name

View File

@@ -61,7 +61,7 @@ wchar_t encoding_convert_big5_to_unicode(wchar_t big5);
extern const char real_name_initials[16];
extern const char *real_names[1024];
extern utf8 *gUserStrings;
extern utf8 gUserStrings[MAX_USER_STRINGS * USER_STRING_MAX_LENGTH];
extern char gCommonStringFormatBuffer[256];
extern uint8 gCommonFormatArgs[80];
extern uint8 gMapTooltipFormatArgs[40];

View File

@@ -14,14 +14,13 @@
*****************************************************************************/
#pragma endregion
#include "../addresses.h"
#include "../game.h"
#include "../ride/ride.h"
#include "../util/util.h"
#include "localisation.h"
#include "user.h"
utf8 *gUserStrings = RCT2_ADDRESS(0x0135A8F4, char);
utf8 gUserStrings[MAX_USER_STRINGS * USER_STRING_MAX_LENGTH];
static bool user_string_exists(const utf8 *text);