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

Fix macOS build use uint32 rather than char32_t

This commit is contained in:
Richard Jenkins 2018-01-23 21:05:55 +00:00
parent 2c8ab6fb68
commit daecb02d00
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/localisation/Convert.cpp
View File

@ -78,7 +78,7 @@ static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_conver
else return entry->unicode;
}
char32_t encoding_convert_unicode_to_rct2(char32_t unicode)
uint32 encoding_convert_unicode_to_rct2(uint32 unicode)
{
// Can't do a binary search as it's sorted by RCT2 code, not unicode
for (uint32 i = 0; i < Util::CountOf(RCT2ToUnicodeTable); i++) {

3
src/openrct2/localisation/Localisation.h
View File

@ -17,7 +17,6 @@
#ifndef LOCALISATION_H
#define LOCALISATION_H
#include <uchar.h>
#include "Currency.h"
#include "Date.h"
#include "FormatCodes.h"
@ -59,7 +58,7 @@ sint32 win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t
sint32 rct2_to_utf8(utf8 *dst, const char *src);
sint32 utf8_to_rct2(char *dst, const utf8 *src);
wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str);
char32_t encoding_convert_unicode_to_rct2(char32_t unicode);
uint32 encoding_convert_unicode_to_rct2(uint32 unicode);
wchar_t encoding_convert_gb2312_to_unicode(wchar_t gb2312);
wchar_t encoding_convert_big5_to_unicode(wchar_t big5);
wchar_t encoding_convert_cp932_to_unicode(wchar_t cp932);