mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Replace our own integer types with standard ones

Browse Source
This commit is contained in:
Michael Steenbeek
2018-06-20 17:28:51 +02:00
parent ec3a1e575e
commit 1b08fb4e69
618 changed files with 33440 additions and 33449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ static std::wstring DecodeToWideChar(const std::string_view& src)
if (c == 255)
{
// Push next two characters
uint8 a = 0;
uint8 b = 0;
uint8_t a = 0;
uint8_t b = 0;
if (it != src.end())
{
a = *it++;
@@ -89,17 +89,17 @@ static std::string Encode(const std::string_view& src)
{
std::string dst;
const utf8 * ch = src.data();
sint32 codepoint;
int32_t codepoint;
while ((codepoint = utf8_get_next(ch, &ch)) != 0)
{
codepoint = encoding_convert_unicode_to_rct2(codepoint);
if (codepoint <= std::numeric_limits<uint8>::max())
if (codepoint <= std::numeric_limits<uint8_t>::max())
{
dst.push_back(codepoint);
}
else if (codepoint <= std::numeric_limits<uint16>::max())
else if (codepoint <= std::numeric_limits<uint16_t>::max())
{
dst.push_back((char)(uint8)0xFF);
dst.push_back((char)(uint8_t)0xFF);
dst.push_back((codepoint >> 8) & 0xFF);
dst.push_back(codepoint & 0xFF);
}
@@ -112,7 +112,7 @@ static std::string Encode(const std::string_view& src)
return dst;
}
static sint32 GetCodePageForRCT2Language(RCT2LanguageId languageId)
static int32_t GetCodePageForRCT2Language(RCT2LanguageId languageId)
{
switch (languageId)
{