Merge remote-tracking branch 'upstream/master'

gframe/bufferio.h

@@ -82,9 +82,9 @@ public:
 			case 4:
 				if (sizeof(wchar_t) == 2) {
 					cur = 0;
-					cur |= ((unsigned)*wsrc & 0x3ff) << 10;
+					cur |= (*wsrc & 0x3ffU) << 10;
 					++wsrc;
-					cur |= (unsigned)*wsrc & 0x3ff;
+					cur |= *wsrc & 0x3ffU;
 					cur += 0x10000;
 				}
 				pstr[0] = ((cur >> 18) & 0x7) | 0xf0;
@@ -107,7 +107,7 @@ public:
 		const char* p = src;
 		wchar_t* wp = wstr;
 		while(*p != 0) {
-			const unsigned cur = (unsigned)*p & 0xff;
+			const unsigned cur = *p & 0xffU;
 			int codepoint_size = 0;
 			if ((cur & 0xf8) == 0xf0) {
 				if (sizeof(wchar_t) == 2)
@@ -123,19 +123,19 @@ public:
 				*wp = *p;
 				p++;
 			} 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;
 			} 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;
 			} else if((cur & 0xf8) == 0xf0) {
 				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;
 					*wp++ = (unicode >> 10) | 0xd800;
 					*wp = (unicode & 0x3ff) | 0xdc00;
 				} 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;
 			} else

gframe/game.cpp

@@ -187,7 +187,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	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>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

strings.conf

@@ -557,6 +557,7 @@
 !victory 0x20 「真艾克佐迪亚」特殊胜利
 !victory 0x21 「混沌虚数No.1000 梦幻虚光神 原数天灵·原数天地」特殊胜利
 !victory 0x22 「席取-六双丸」特殊胜利
+!victory 0x23 「火器的祝台」特殊胜利
 !victory 0xffff 由于「%ls」获得比赛胜利
 #counters
 !counter 0x1 魔力指示物
@@ -661,6 +662,7 @@
 !counter 0x6a 响鸣指示物
 !counter 0x6b 狂乱指示物
 !counter 0x6c 访问指示物
+!counter 0x6d 祝台指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1224,3 +1226,13 @@
 !setname 0x1b3 徽记	エンブレーマ
 !setname 0x1b4 时空	タキオン
 !setname 0x1b5 蓝泪	青い涙
+!setname 0x1b6 石版
+!setname 0x1b7 拟箱掳尸	Mimighoul
+!setname 0x1b8 鲨	シャーク
+!setname 0x11b8 鲨龙兽	シャーク・ドレイク
+!setname 0x1b9 原石
+!setname 0x1ba 六武式
+!setname 0x1bb 金属化	メタル化
+!setname 0x1bc 魔瞳
+!setname 0x1bd 蓟花	アザミナ
+!setname 0x1be 祝台