test

gframe/game.cpp

@@ -29,6 +29,7 @@ Game* mainGame;
 
 #ifdef YGOPRO_SERVER_MODE
 unsigned short aServerPort;
+unsigned short replay_mode;
 unsigned int lflist;
 unsigned char rule;
 unsigned char mode;
@@ -37,7 +38,6 @@ bool no_check_deck;
 bool no_shuffle_deck;
 unsigned int start_lp;
 unsigned short time_limit;
-unsigned short replay_mode;
 unsigned char start_hand;
 unsigned char draw_count;
 

gframe/game.h

@@ -438,6 +438,7 @@ public:
 extern Game* mainGame;
 #ifdef YGOPRO_SERVER_MODE
 extern unsigned short aServerPort;
+unsigned short replay_mode;
 extern unsigned int lflist;
 extern unsigned char rule;
 extern unsigned char mode;
@@ -446,8 +447,7 @@ extern bool no_check_deck;
 extern bool no_shuffle_deck;
 extern unsigned int start_lp;
 extern unsigned short time_limit;
-extern unsigned short replay_mode;
-extern unsigned char start_hand;
+xextern unsigned char start_hand;
 extern unsigned char draw_count;
 #endif //YGOPRO_SERVER_MODE
 

gframe/network.h

@@ -22,7 +22,6 @@ struct HostInfo {
 	unsigned char start_hand;
 	unsigned char draw_count;
 	unsigned short time_limit;
-	unsigned short replay_mode;
 };
 struct HostPacket {
 	unsigned short identifier;

gframe/single_duel.cpp

@@ -87,7 +87,6 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 			host_info.duel_rule=DEFAULT_DUEL_RULE;
 			host_info.rule=0;
 			host_info.time_limit=180;
-			host_info.replay_mode=0;
 
 			if (ygo::start_hand !=0 ){
 				host_info.start_hand=ygo::start_hand;
@@ -99,7 +98,6 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 				host_info.duel_rule=ygo::duel_rule;
 				host_info.rule=ygo::rule;
 				host_info.time_limit=ygo::time_limit;
-				host_info.replay_mode=ygo::replay_mode;
 			}
 		}else
 		{
@@ -1559,7 +1557,7 @@ void SingleDuel::EndDuel() {
 	memcpy(pbuf, last_replay.comp_data, last_replay.comp_size);
 	NetServer::SendBufferToPlayer(players[0], STOC_REPLAY, replaybuf, sizeof(ReplayHeader) + last_replay.comp_size);
 	NetServer::ReSendToPlayer(players[1]);
-	if (host_info.replay_mode == 0) {
+	if (ygo::replay_mode == 0) {
 		for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 			NetServer::ReSendToPlayer(*oit);
 		for(auto oit = recorders.begin(); oit != recorders.end(); ++oit)

gframe/tag_duel.cpp

@@ -68,7 +68,6 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 			host_info.duel_rule=DEFAULT_DUEL_RULE;
 			host_info.rule=0;
 			host_info.time_limit=180;
-			host_info.replay_mode=0;
 
 			if (ygo::start_hand !=0 ){
 				host_info.start_hand=ygo::start_hand;
@@ -80,7 +79,6 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 				host_info.duel_rule=ygo::duel_rule;
 				host_info.rule=ygo::rule;
 				host_info.time_limit=ygo::time_limit;
-				host_info.replay_mode=ygo::replay_mode;
 			}
 		}else
 		{
@@ -1623,7 +1621,7 @@ void TagDuel::EndDuel() {
 	NetServer::ReSendToPlayer(players[1]);
 	NetServer::ReSendToPlayer(players[2]);
 	NetServer::ReSendToPlayer(players[3]);
-	if (host_info.replay_mode == 0) {
+	if (ygo::replay_mode == 0) {
 		for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 			NetServer::ReSendToPlayer(*oit);
 		for(auto oit = recorders.begin(); oit != recorders.end(); ++oit)