Merge branch 'inf_time' into another

gframe/duelclient.cpp

@@ -603,6 +603,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->dInfo.time_player = 2;
 		mainGame->dInfo.isReplaySwapped = false;
 		mainGame->dInfo.announce_cache.clear();
+		mainGame->dInfo.isReconnected = false;
 		mainGame->is_building = false;
 		mainGame->wCardImg->setVisible(true);
 		mainGame->wInfos->setVisible(true);
@@ -682,6 +683,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->dInfo.isStarted = false;
 		mainGame->dInfo.isFinished = true;
 		mainGame->dInfo.announce_cache.clear();
+		mainGame->dInfo.isReconnected = false;
 		mainGame->is_building = false;
 		mainGame->wDeckEdit->setVisible(false);
 		mainGame->btnCreateHost->setEnabled(true);
@@ -768,8 +770,11 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 	case STOC_TIME_LIMIT: {
 		STOC_TimeLimit* pkt = (STOC_TimeLimit*)pdata;
 		int lplayer = mainGame->LocalPlayer(pkt->player);
-		//if(lplayer == 0)
-		//	DuelClient::SendPacketToServer(CTOS_TIME_CONFIRM);
+		if(lplayer == 0 && mainGame->dInfo.isReconnected)
+		{
+			mainGame->dInfo.isReconnected = false;
+			DuelClient::SendPacketToServer(CTOS_TIME_CONFIRM);
+		}
 		if(lplayer == 1)
 			mainGame->dInfo.time_player = lplayer;
 		mainGame->dInfo.time_left[lplayer] = pkt->left_time;
@@ -3734,6 +3739,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->gMutex.Lock();
 		mainGame->dField.Clear();
 		mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
+		mainGame->dInfo.isReconnected = true;
 		int val = 0;
 		for(int i = 0; i < 2; ++i) {
 			int p = mainGame->LocalPlayer(i);

gframe/game.cpp

@@ -1445,7 +1445,7 @@ void Game::SaveConfig() {
 	FILE* fp = fopen("system_user.conf", "w");
 #endif //YGOPRO_COMPAT_MYCARD
 	fprintf(fp, "#config file\n#nickname & gamename should be less than 20 characters\n");
-	char linebuf[512];
+	char linebuf[256];
 	fprintf(fp, "use_d3d = %d\n", gameConf.use_d3d ? 1 : 0);
 	fprintf(fp, "use_image_scale = %d\n", gameConf.use_image_scale ? 1 : 0);
 	fprintf(fp, "pro_version = %d\n", PRO_VERSION);

gframe/game.h

@@ -90,6 +90,7 @@ struct DuelInfo {
 	wchar_t str_card_count[2][16];
 	video::SColor card_count_color[2];
 	bool isReplaySwapped;
+	bool isReconnected;
 	std::vector<unsigned int> announce_cache;
 };
 

ocgcore @ 4021b88f

-Subproject commit 9cc9bb5c2fbea7423952ee0e49befbe6ddadb0a7
+Subproject commit 4021b88fece56ace8d56ba0ec000b9939e561adc

script @ 2e9a5be7

-Subproject commit 85604b1c222fabdad39f18bf1580358d298aaa84
+Subproject commit 2e9a5be7958610f4274944c6d19c221b4a2d2600