Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

gframe/network.h

@@ -144,7 +144,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;
@@ -944,7 +944,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

@@ -2183,7 +2183,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

@@ -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 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;
@@ -844,7 +844,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

@@ -2312,7 +2312,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: