Merge branch 'master' into server

gframe/duelclient.cpp

@@ -1011,7 +1011,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 	}
 	switch(mainGame->dInfo.curMsg) {
 	case MSG_RESET_TIME: {
-		pbuf += 2;
+		pbuf += 3;
 		break;
 	}
 	case MSG_RETRY: {

gframe/single_duel.cpp

@@ -749,7 +749,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
 		switch (engType) {
 		case MSG_RESET_TIME: {
 			player = BufferIO::ReadInt8(pbuf);
-			int time = BufferIO::ReadInt8(pbuf);
+			short time = BufferIO::ReadInt16(pbuf);
 			if(host_info.time_limit) {
 				if(time)
 					time_limit[player] = time;

gframe/single_mode.cpp

@@ -182,7 +182,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 		mainGame->dInfo.curMsg = BufferIO::ReadUInt8(pbuf);
 		switch (mainGame->dInfo.curMsg) {
 		case MSG_RESET_TIME: {
-			pbuf += 2;
+			pbuf += 3;
 			break;
 		}
 		case MSG_RETRY: {

gframe/tag_duel.cpp

@@ -705,7 +705,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 		switch (engType) {
 		case MSG_RESET_TIME: {
 			player = BufferIO::ReadInt8(pbuf);
-			int time = BufferIO::ReadInt8(pbuf);
+			short time = BufferIO::ReadInt16(pbuf);
 			if(host_info.time_limit) {
 				if(time)
 					time_limit[player] = time;

ocgcore @ 1eedc8d1

-Subproject commit b43c3762795b73c51c3bcb684fe789fc7bb07b17
+Subproject commit 1eedc8d1b7e4b36f7a78431351238b330b723aad