Merge branch 'server' into server-develop

gframe/game.cpp

@@ -94,7 +94,7 @@ bool IsExtension(const wchar_t* filename, const wchar_t* extension) {
 #ifdef YGOPRO_SERVER_MODE
 unsigned short server_port;
 unsigned short replay_mode;
-unsigned int pre_seed[3];
+unsigned int pre_seed[5];
 unsigned int duel_flags;
 HostInfo game_info;
 

gframe/game.h

@@ -688,7 +688,7 @@ extern Game* mainGame;
 extern unsigned short server_port;
 extern unsigned short replay_mode;
 extern HostInfo game_info;
-extern unsigned int pre_seed[3];
+extern unsigned int pre_seed[5];
 extern unsigned int duel_flags;
 #endif
 }

gframe/gframe.cpp

@@ -121,7 +121,7 @@ int main(int argc, char* argv[]) {
 		ygo::game_info.draw_count = atoi(argv[10]);
 		ygo::game_info.time_limit = atoi(argv[11]);
 		ygo::replay_mode = atoi(argv[12]);
-		for (int i = 13; (i < argc && i <= 15) ; ++i)
+		for (int i = 13; (i < argc && i <= 17) ; ++i)
 		{
 			ygo::pre_seed[i - 13] = (unsigned int)atol(argv[i]);
 		}

gframe/single_duel.h

@@ -80,7 +80,11 @@ protected:
 	int match_kill{ 0 };
 	unsigned char duel_count{ 0 };
 	unsigned char tp_player{ 0 };
+#ifdef YGOPRO_SERVER_MODE
+	unsigned char match_result[5]{};
+#else
 	unsigned char match_result[3]{};
+#endif
 	short time_limit[2]{};
 	short time_elapsed{ 0 };
 #ifdef YGOPRO_SERVER_MODE
@@ -93,4 +97,3 @@ protected:
 }
 
 #endif //SINGLE_DUEL_H
-