merge reconnection

gframe/netserver.cpp

@@ -230,7 +230,11 @@ void NetServer::DisconnectPlayer(DuelPlayer* dp) {
 void NetServer::HandleCTOSPacket(DuelPlayer* dp, char* data, unsigned int len) {
 	char* pdata = data;
 	unsigned char pktType = BufferIO::ReadUInt8(pdata);
+#ifdef YGOPRO_SERVER_MODE
+	if((pktType != CTOS_SURRENDER) && (pktType != CTOS_CHAT) && (pktType != CTOS_REQUEST_FIELD) && (dp->state == 0xff || (dp->state && dp->state != pktType)))
+#else
 	if((pktType != CTOS_SURRENDER) && (pktType != CTOS_CHAT) && (dp->state == 0xff || (dp->state && dp->state != pktType)))
+#endif
 		return;
 	switch(pktType) {
 	case CTOS_RESPONSE: {
@@ -360,6 +364,14 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, char* data, unsigned int len) {
 		duel_mode->StartDuel(dp);
 		break;
 	}
+#ifdef YGOPRO_SERVER_MODE
+	case CTOS_REQUEST_FIELD: {
+		if(!dp->game || !duel_mode->pduel)
+			break;
+		duel_mode->RequestField(dp);
+		break;
+	}
+#endif
 	}
 }
 

gframe/network.h

@@ -134,6 +134,9 @@ public:
 	virtual void Surrender(DuelPlayer* dp) {}
 	virtual void GetResponse(DuelPlayer* dp, void* pdata, unsigned int len) {}
 	virtual void TimeConfirm(DuelPlayer* dp) {}
+#ifdef YGOPRO_SERVER_MODE
+	virtual void RequestField(DuelPlayer* dp) {}
+#endif
 	virtual void EndDuel() {};
 #ifdef YGOPRO_SERVER_MODE
 	virtual void TestCard(int code) {};
@@ -178,6 +181,9 @@ public:
 #define CTOS_HS_NOTREADY	0x23
 #define CTOS_HS_KICK		0x24
 #define CTOS_HS_START		0x25
+#ifdef YGOPRO_SERVER_MODE
+#define CTOS_REQUEST_FIELD		0x30
+#endif
 
 #define STOC_GAME_MSG		0x1
 #define STOC_ERROR_MSG		0x2
@@ -199,6 +205,9 @@ public:
 #define STOC_HS_PLAYER_ENTER	0x20
 #define STOC_HS_PLAYER_CHANGE	0x21
 #define STOC_HS_WATCH_CHANGE	0x22
+#ifdef YGOPRO_SERVER_MODE
+#define STOC_FIELD_FINISH	0x30
+#endif
 
 #define PLAYERCHANGE_OBSERVE	0x8
 #define PLAYERCHANGE_READY		0x9

gframe/single_duel.h

@@ -27,6 +27,9 @@ public:
 	virtual int Analyze(char* msgbuffer, unsigned int len);
 	virtual void GetResponse(DuelPlayer* dp, void* pdata, unsigned int len);
 	virtual void TimeConfirm(DuelPlayer* dp);
+#ifdef YGOPRO_SERVER_MODE
+	virtual void RequestField(DuelPlayer* dp);
+#endif
 	virtual void EndDuel();
 #ifdef YGOPRO_SERVER_MODE
 	virtual void TestCard(int code);
@@ -34,11 +37,20 @@ public:
 	
 	void DuelEndProc();
 	void WaitforResponse(int playerid);
+#ifdef YGOPRO_SERVER_MODE
+	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshRemoved(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+#else
 	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1);
 	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1);
 	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1);
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
+#endif
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	
 	static int MessageHandler(long fduel, int type);
@@ -57,6 +69,9 @@ protected:
 #ifdef YGOPRO_SERVER_MODE
 	DuelPlayer* cache_recorder;
 	DuelPlayer* replay_recorder;
+	int lp[2];
+	unsigned char turn_player;
+	unsigned short phase;
 #endif
 	Replay last_replay;
 	bool match_mode;

gframe/tag_duel.h

@@ -27,15 +27,27 @@ public:
 	virtual int Analyze(char* msgbuffer, unsigned int len);
 	virtual void GetResponse(DuelPlayer* dp, void* pdata, unsigned int len);
 	virtual void TimeConfirm(DuelPlayer* dp);
+#ifdef YGOPRO_SERVER_MODE
+	virtual void RequestField(DuelPlayer* dp);
+#endif
 	virtual void EndDuel();
 	
 	void DuelEndProc();
 	void WaitforResponse(int playerid);
+#ifdef YGOPRO_SERVER_MODE
+	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+	void RefreshRemoved(int player, int flag = 0x81fff, int use_cache = 1, DuelPlayer* dp = 0);
+#else
 	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1);
 	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1);
 	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1);
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
 	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
+#endif
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 	
 	static int MessageHandler(long fduel, int type);
@@ -49,6 +61,9 @@ protected:
 #ifdef YGOPRO_SERVER_MODE
 	DuelPlayer* cache_recorder;
 	DuelPlayer* replay_recorder;
+	int lp[2];
+	int turn_player;
+	int phase;
 #endif
 	bool ready[4];
 	Deck pdeck[4];