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

Use all leading format codes for timestamp

This commit is contained in:
Ted John 2017-06-10 00:53:51 +01:00
parent f2a5d10c31
commit ca68e2bb89
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/interface/chat.c
View File

@ -177,17 +177,20 @@ void chat_history_add(const char * src)
size_t bufferSize = strlen(src) + 64; size_t bufferSize = strlen(src) + 64;
utf8 * buffer = (utf8 *)calloc(1, bufferSize); utf8 * buffer = (utf8 *)calloc(1, bufferSize);
// Prepend colour marker (based on text, default to white) // Find the start of the text (after format codes)
const char * ch = src; const char * ch = src;
uint32 colour = FORMAT_WHITE; const char * nextCh;
uint32 codepoint; uint32 codepoint;
while ((codepoint = utf8_get_next(ch, &ch)) != 0) { while ((codepoint = utf8_get_next(ch, &nextCh)) != 0) {
if (utf8_is_colour_code(codepoint)) { if (!utf8_is_format_code(codepoint)) {
colour = codepoint;
break; break;
} }
ch = nextCh;
} }
utf8_write_codepoint(buffer, colour); const char * srcText = ch;
// Copy format codes to buffer
memcpy(buffer, src, min(bufferSize, (size_t)(srcText - src)));
// Prepend a timestamp // Prepend a timestamp
time_t timer; time_t timer;
@ -195,7 +198,7 @@ void chat_history_add(const char * src)
struct tm * tmInfo = localtime(&timer); struct tm * tmInfo = localtime(&timer);
strcatftime(buffer, bufferSize, "[%H:%M] ", tmInfo); strcatftime(buffer, bufferSize, "[%H:%M] ", tmInfo);
safe_strcat(buffer, src, bufferSize); safe_strcat(buffer, srcText, bufferSize);
// Add to history list // Add to history list
sint32 index = _chatHistoryIndex % CHAT_HISTORY_SIZE; sint32 index = _chatHistoryIndex % CHAT_HISTORY_SIZE;