Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 3652f4fb authored by fallenstardust's avatar fallenstardust
Browse files
Options

update bufferio.h

parent 30f9ed2c
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
Classes/gframe/bufferio.h
View file @ 3652f4fb
...@@ -82,9 +82,9 @@ public: ...@@ -82,9 +82,9 @@ public:
case 4: case 4:
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
cur = 0; cur = 0;
cur |= ((unsigned)*wsrc & 0x3ff) << 10; cur |= (*wsrc & 0x3ffU) << 10;
++wsrc; ++wsrc;
cur |= (unsigned)*wsrc & 0x3ff; cur |= *wsrc & 0x3ffU;
cur += 0x10000; cur += 0x10000;
} }
pstr[0] = ((cur >> 18) & 0x7) | 0xf0; pstr[0] = ((cur >> 18) & 0x7) | 0xf0;
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
const char* p = src; const char* p = src;
wchar_t* wp = wstr; wchar_t* wp = wstr;
while(*p != 0) { while(*p != 0) {
const unsigned cur = (unsigned)*p & 0xff; const unsigned cur = *p & 0xffU;
int codepoint_size = 0; int codepoint_size = 0;
if ((cur & 0xf8) == 0xf0) { if ((cur & 0xf8) == 0xf0) {
if (sizeof(wchar_t) == 2) if (sizeof(wchar_t) == 2)
...@@ -123,19 +123,19 @@ public: ...@@ -123,19 +123,19 @@ public:
*wp = *p; *wp = *p;
p++; p++;
} else if((cur & 0xe0) == 0xc0) { } else if((cur & 0xe0) == 0xc0) {
*wp = (((unsigned)p[0] & 0x1f) << 6) | ((unsigned)p[1] & 0x3f); *wp = ((p[0] & 0x1fU) << 6) | (p[1] & 0x3fU);
p += 2; p += 2;
} else if((cur & 0xf0) == 0xe0) { } else if((cur & 0xf0) == 0xe0) {
*wp = (((unsigned)p[0] & 0xf) << 12) | (((unsigned)p[1] & 0x3f) << 6) | ((unsigned)p[2] & 0x3f); *wp = ((p[0] & 0xfU) << 12) | ((p[1] & 0x3fU) << 6) | (p[2] & 0x3fU);
p += 3; p += 3;
} else if((cur & 0xf8) == 0xf0) { } else if((cur & 0xf8) == 0xf0) {
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
unsigned unicode = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f); unsigned unicode = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
unicode -= 0x10000; unicode -= 0x10000;
*wp++ = (unicode >> 10) | 0xd800; *wp++ = (unicode >> 10) | 0xd800;
*wp = (unicode & 0x3ff) | 0xdc00; *wp = (unicode & 0x3ff) | 0xdc00;
} else { } else {
*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f); *wp = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
} }
p += 4; p += 4;
} else } else
......
Classes/gframe/game.cpp
View file @ 3652f4fb
...@@ -284,7 +284,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -284,7 +284,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
//main menu //main menu
wchar_t strbuf[256]; wchar_t strbuf[256];
myswprintf(strbuf, L"YGOPro Version:%X.0%X.%X", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"YGOPro Version:%X.0%X.%X", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
wMainMenu = env->addWindow(rect<s32>(450 * xScale, 40 * yScale, 900 * xScale, 600 * yScale), false, strbuf); wMainMenu = env->addWindow(rect<s32>(450 * xScale, 40 * yScale, 900 * xScale, 600 * yScale), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false); wMainMenu->getCloseButton()->setVisible(false);
wMainMenu->setDrawBackground(false); wMainMenu->setDrawBackground(false);
......
libcore/android/bufferio_android.h
View file @ 3652f4fb
...@@ -82,9 +82,9 @@ public: ...@@ -82,9 +82,9 @@ public:
case 4: case 4:
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
cur = 0; cur = 0;
cur |= ((unsigned)*wsrc & 0x3ff) << 10; cur |= (*wsrc & 0x3ffU) << 10;
++wsrc; ++wsrc;
cur |= (unsigned)*wsrc & 0x3ff; cur |= *wsrc & 0x3ffU;
cur += 0x10000; cur += 0x10000;
} }
pstr[0] = ((cur >> 18) & 0x7) | 0xf0; pstr[0] = ((cur >> 18) & 0x7) | 0xf0;
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
const char* p = src; const char* p = src;
wchar_t* wp = wstr; wchar_t* wp = wstr;
while(*p != 0) { while(*p != 0) {
const unsigned cur = (unsigned)*p & 0xff; const unsigned cur = *p & 0xffU;
int codepoint_size = 0; int codepoint_size = 0;
if ((cur & 0xf8) == 0xf0) { if ((cur & 0xf8) == 0xf0) {
if (sizeof(wchar_t) == 2) if (sizeof(wchar_t) == 2)
...@@ -123,19 +123,19 @@ public: ...@@ -123,19 +123,19 @@ public:
*wp = *p; *wp = *p;
p++; p++;
} else if((cur & 0xe0) == 0xc0) { } else if((cur & 0xe0) == 0xc0) {
*wp = (((unsigned)p[0] & 0x1f) << 6) | ((unsigned)p[1] & 0x3f); *wp = ((p[0] & 0x1fU) << 6) | (p[1] & 0x3fU);
p += 2; p += 2;
} else if((cur & 0xf0) == 0xe0) { } else if((cur & 0xf0) == 0xe0) {
*wp = (((unsigned)p[0] & 0xf) << 12) | (((unsigned)p[1] & 0x3f) << 6) | ((unsigned)p[2] & 0x3f); *wp = ((p[0] & 0xfU) << 12) | ((p[1] & 0x3fU) << 6) | (p[2] & 0x3fU);
p += 3; p += 3;
} else if((cur & 0xf8) == 0xf0) { } else if((cur & 0xf8) == 0xf0) {
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
unsigned unicode = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f); unsigned unicode = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
unicode -= 0x10000; unicode -= 0x10000;
*wp++ = (unicode >> 10) | 0xd800; *wp++ = (unicode >> 10) | 0xd800;
*wp = (unicode & 0x3ff) | 0xdc00; *wp = (unicode & 0x3ff) | 0xdc00;
} else { } else {
*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f); *wp = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
} }
p += 4; p += 4;
} else } else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment