Merge branch 'server' of github.com:moecube/ygopro into server

gframe/single_duel.cpp

@@ -627,6 +627,14 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	RefreshExtra(0);
 	RefreshExtra(1);
 	start_duel(pduel, opt);
+	if(host_info.time_limit) {
+		time_elapsed = 0;
+#ifdef YGOPRO_SERVER_MODE
+		time_compensator = host_info.time_limit;
+#endif
+		timeval timeout = { 1, 0 };
+		event_add(etimer, &timeout);
+	}
 	Process();
 }
 void SingleDuel::Process() {
@@ -1763,7 +1771,7 @@ void SingleDuel::GetResponse(DuelPlayer* dp, void* pdata, unsigned int len) {
 		if(time_limit[dp->type] >= time_elapsed)
 			time_limit[dp->type] -= time_elapsed;
 		else time_limit[dp->type] = 0;
-		event_del(etimer);
+		time_elapsed = 0;
 	}
 	Process();
 }
@@ -1788,6 +1796,7 @@ void SingleDuel::EndDuel() {
 		NetServer::ReSendToPlayer(*oit);
 #endif //YGOPRO_SERVER_MODE
 	end_duel(pduel);
+	event_del(etimer);
 	pduel = 0;
 }
 void SingleDuel::WaitforResponse(int playerid) {
@@ -1874,9 +1883,15 @@ void SingleDuel::TimeConfirm(DuelPlayer* dp) {
 	if(dp->type != last_response)
 		return;
 	players[last_response]->state = CTOS_RESPONSE;
-	time_elapsed = 0;
-	timeval timeout = {1, 0};
-	event_add(etimer, &timeout);
+#ifdef YGOPRO_SERVER_MODE
+	if(time_elapsed < 10 && time_elapsed <= time_compensator){
+		time_compensator -= time_elapsed;
+		time_elapsed = 0;
+	}
+#else
+	if(time_elapsed < 10)
+		time_elapsed = 0;
+#endif //YGOPRO_SERVER_MODE
 }
 #ifdef YGOPRO_SERVER_MODE
 void SingleDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp)
@@ -2186,7 +2201,10 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
 		sd->EndDuel();
 		sd->DuelEndProc();
 		event_del(sd->etimer);
+		return;
 	}
+	timeval timeout = { 1, 0 };
+	event_add(sd->etimer, &timeout);
 }
 #ifdef YGOPRO_SERVER_MODE
 void SingleDuel::TestCard(int code) {

gframe/single_duel.h

@@ -79,6 +79,9 @@ protected:
 	unsigned char match_result[3];
 	unsigned short time_limit[2];
 	unsigned short time_elapsed;
+#ifdef YGOPRO_SERVER_MODE
+	unsigned short time_compensator;
+#endif
 };
 
 }

gframe/tag_duel.cpp

@@ -632,6 +632,14 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	RefreshExtra(0);
 	RefreshExtra(1);
 	start_duel(pduel, opt);
+	if(host_info.time_limit) {
+		time_elapsed = 0;
+#ifdef YGOPRO_SERVER_MODE
+		time_compensator = host_info.time_limit;
+#endif
+		timeval timeout = { 1, 0 };
+		event_add(etimer, &timeout);
+	}
 	Process();
 }
 void TagDuel::Process() {
@@ -1858,7 +1866,7 @@ void TagDuel::GetResponse(DuelPlayer* dp, void* pdata, unsigned int len) {
 		if(time_limit[resp_type] >= time_elapsed)
 			time_limit[resp_type] -= time_elapsed;
 		else time_limit[resp_type] = 0;
-		event_del(etimer);
+		time_elapsed = 0;
 	}
 	Process();
 }
@@ -1885,6 +1893,7 @@ void TagDuel::EndDuel() {
 		NetServer::ReSendToPlayer(*oit);
 #endif
 	end_duel(pduel);
+	event_del(etimer);
 	pduel = 0;
 }
 void TagDuel::WaitforResponse(int playerid) {
@@ -1975,9 +1984,15 @@ void TagDuel::TimeConfirm(DuelPlayer* dp) {
 	if(dp != cur_player[last_response])
 		return;
 	cur_player[last_response]->state = CTOS_RESPONSE;
-	time_elapsed = 0;
-	timeval timeout = {1, 0};
-	event_add(etimer, &timeout);
+#ifdef YGOPRO_SERVER_MODE
+	if(time_elapsed < 10 && time_elapsed <= time_compensator){
+		time_compensator -= time_elapsed;
+		time_elapsed = 0;
+	}
+#else
+	if(time_elapsed < 10)
+		time_elapsed = 0;
+#endif //YGOPRO_SERVER_MODE
 }
 #ifdef YGOPRO_SERVER_MODE
 void TagDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp)
@@ -2333,7 +2348,10 @@ void TagDuel::TagTimer(evutil_socket_t fd, short events, void* arg) {
 		sd->EndDuel();
 		sd->DuelEndProc();
 		event_del(sd->etimer);
+		return;
 	}
+	timeval timeout = { 1, 0 };
+	event_add(sd->etimer, &timeout);
 }
 
 }

gframe/tag_duel.h

@@ -73,6 +73,9 @@ protected:
 	unsigned char turn_count;
 	unsigned short time_limit[2];
 	unsigned short time_elapsed;
+#ifdef YGOPRO_SERVER_MODE
+	unsigned short time_compensator;
+#endif
 };
 
 }