Merge branch 'master' into server

gframe/event_handler.cpp

@@ -1621,7 +1621,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 									myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
 									str.append(formatBuffer);
 								}
-								if(mcard->location == LOCATION_SZONE && mcard->lscale) {
+								if(mcard->location == LOCATION_SZONE && (mcard->type & TYPE_PENDULUM)) {
 									myswprintf(formatBuffer, L"\n%d/%d", mcard->lscale, mcard->rscale);
 									str.append(formatBuffer);
 								}

gframe/game.cpp

@@ -211,7 +211,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Yurika", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X PONPONPON", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	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));

gframe/network.h

@@ -147,7 +147,7 @@ public:
 	DuelPlayer* host_player;
 	HostInfo host_info;
 	int duel_stage;
-	unsigned long pduel;
+	intptr_t pduel;
 	wchar_t name[20];
 	wchar_t pass[20];
 };

gframe/replay_mode.cpp

@@ -7,7 +7,7 @@
 
 namespace ygo {
 
-long ReplayMode::pduel = 0;
+intptr_t ReplayMode::pduel = 0;
 Replay ReplayMode::cur_replay;
 bool ReplayMode::is_continuing = true;
 bool ReplayMode::is_closing = false;
@@ -565,6 +565,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 			DuelClient::ClientAnalyze(offset, pbuf - offset);
 			if(cl && !(cl & 0x80) && (pl != cl || pc != cc))
 				ReplayRefreshSingle(cc, cl, cs);
+			else if(pl == cl && cl == LOCATION_DECK)
+				ReplayRefreshDeck(cc);
 			break;
 		}
 		case MSG_POS_CHANGE: {
@@ -961,7 +963,7 @@ void ReplayMode::ReplayReload() {
 	/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
-int ReplayMode::MessageHandler(long fduel, int type) {
+int ReplayMode::MessageHandler(intptr_t fduel, int type) {
 	if(!enable_log)
 		return 0;
 	char msgbuf[1024];

gframe/replay_mode.h

@@ -11,7 +11,7 @@ namespace ygo {
 
 class ReplayMode {
 private:
-	static long pduel;
+	static intptr_t pduel;
 	static bool is_continuing;
 	static bool is_closing;
 	static bool is_pausing;
@@ -47,7 +47,7 @@ public:
 	static void ReplayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	static void ReplayReload();
 
-	static int MessageHandler(long fduel, int type);
+	static int MessageHandler(intptr_t fduel, int type);
 };
 
 }

gframe/single_duel.cpp

@@ -2184,7 +2184,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
 #endif
 	}
 }
-int SingleDuel::MessageHandler(long fduel, int type) {
+int SingleDuel::MessageHandler(intptr_t fduel, int type) {
 	if(!enable_log)
 		return 0;
 	char msgbuf[1024];

gframe/single_duel.h

@@ -53,7 +53,7 @@ public:
 #endif
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 
-	static int MessageHandler(long fduel, int type);
+	static int MessageHandler(intptr_t fduel, int type);
 	static void SingleTimer(evutil_socket_t fd, short events, void* arg);
 	
 protected:

gframe/single_mode.cpp

@@ -6,7 +6,7 @@
 
 namespace ygo {
 
-long SingleMode::pduel = 0;
+intptr_t SingleMode::pduel = 0;
 bool SingleMode::is_closing = false;
 bool SingleMode::is_continuing = false;
 Replay SingleMode::last_replay;
@@ -852,7 +852,7 @@ void SingleMode::SinglePlayReload() {
 	/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
-int SingleMode::MessageHandler(long fduel, int type) {
+int SingleMode::MessageHandler(intptr_t fduel, int type) {
 	if(!enable_log)
 		return 0;
 	char msgbuf[1024];

gframe/single_mode.h

@@ -7,7 +7,7 @@ namespace ygo {
 
 class SingleMode {
 private:
-	static long pduel;
+	static intptr_t pduel;
 	static bool is_closing;
 	static bool is_continuing;
 
@@ -26,7 +26,7 @@ public:
 	static void SinglePlayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	static void SinglePlayReload();
 
-	static int MessageHandler(long fduel, int type);
+	static int MessageHandler(intptr_t fduel, int type);
 
 protected:
 	static Replay last_replay;

gframe/tag_duel.cpp

@@ -2335,7 +2335,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
 		}
 	}
 }
-int TagDuel::MessageHandler(long fduel, int type) {
+int TagDuel::MessageHandler(intptr_t fduel, int type) {
 	if(!enable_log)
 		return 0;
 	char msgbuf[1024];

gframe/tag_duel.h

@@ -50,7 +50,7 @@ public:
 #endif
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 
-	static int MessageHandler(long fduel, int type);
+	static int MessageHandler(intptr_t fduel, int type);
 	static void TagTimer(evutil_socket_t fd, short events, void* arg);
 	
 protected:

ocgcore @ 9b3458c7

-Subproject commit 301511f52a793f9a940dc352495b62d66454314d
+Subproject commit 9b3458c7db51dbe52fdb7961cea504d4b705b908

script @ d31bd272

-Subproject commit 3c92734b2fd41ea2641c94e1447f32d7ae96c1e5
+Subproject commit d31bd272604f0c3e2cfb206207ab868cb6b010ba

strings.conf

@@ -557,6 +557,7 @@
 !victory 0x1f 「守护神 艾克佐迪亚」特殊胜利
 !victory 0x20 「真艾克佐迪亚」特殊胜利
 !victory 0x21 「混沌虚数No.1000 梦幻虚光神 原数天灵·原数天地」特殊胜利
+!victory 0x22 「席取-六双丸」特殊胜利
 !victory 0xffff 由于「%ls」获得比赛胜利
 #counters
 !counter 0x1 魔力指示物
@@ -1136,3 +1137,6 @@
 !setname 0x176 异晶人的	バリアンズ
 !setname 0x177 海龙神	リバイアサン
 !setname 0x178 潜海	シー・ステルス
+!setname 0x179 兽带斗神	セリオンズ
+!setname 0x17a 肆世坏	スケアクロー
+!setname 0x17b 野蛮人	バーバリアン