rename aServerPort

gframe/game.cpp

@@ -23,7 +23,7 @@ namespace ygo {
 Game* mainGame;
 
 #ifdef YGOPRO_SERVER_MODE
-unsigned short aServerPort;
+unsigned short server_port;
 unsigned short replay_mode;
 unsigned int pre_seed[3];
 HostInfo game_info;
@@ -33,9 +33,9 @@ void Game::MainServerLoop() {
 	dataManager.LoadDB(L"cards.cdb");
 	LoadExpansions();
 	
-	aServerPort = NetServer::StartServer(aServerPort);
+	server_port = NetServer::StartServer(server_port);
 	NetServer::InitDuel();
-	printf("%u\n", aServerPort);
+	printf("%u\n", server_port);
 	fflush(stdout);
 	
 	while(NetServer::net_evbase) {

gframe/game.h

@@ -602,7 +602,7 @@ public:
 
 extern Game* mainGame;
 #ifdef YGOPRO_SERVER_MODE
-extern unsigned short aServerPort;
+extern unsigned short server_port;
 extern unsigned short replay_mode;
 extern HostInfo game_info;
 extern unsigned int pre_seed[3];

gframe/gframe.cpp

@@ -61,7 +61,7 @@ int main(int argc, char* argv[]) {
 	ygo::Game _game;
 #ifdef YGOPRO_SERVER_MODE
 	enable_log = 1;
-	ygo::aServerPort = 7911;
+	ygo::server_port = 7911;
 	ygo::replay_mode = 0;
 	ygo::game_info.lflist = 0;
 	ygo::game_info.rule = 0;
@@ -76,7 +76,7 @@ int main(int argc, char* argv[]) {
 	for (int i = 0; i < 3; ++i)
 		ygo::pre_seed[i] = (unsigned int)0;
 	if (argc > 1) {
-		ygo::aServerPort = atoi(argv[1]);
+		ygo::server_port = atoi(argv[1]);
 		int lflist = atoi(argv[2]);
 		if(lflist < 0)
 			lflist = 999;

gframe/replay.cpp

@@ -6,7 +6,7 @@
 namespace ygo {
 
 #ifdef YGOPRO_SERVER_MODE
-extern unsigned short aServerPort;
+extern unsigned short server_port;
 extern unsigned short replay_mode;
 #endif
 Replay::Replay()
@@ -36,7 +36,7 @@ void Replay::BeginRecord() {
 	wchar_t tmppath[80];
 	wcsftime(tmppath, 80, L"./replay/%Y-%m-%d %H-%M-%S %%u.yrp", localedtime);
 	wchar_t path[80];
-	myswprintf(path, tmppath, aServerPort);
+	myswprintf(path, tmppath, server_port);
 	recording_fp = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
 #else
 	recording_fp = CreateFileW(L"./replay/_LastReplay.yrp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
@@ -52,7 +52,7 @@ void Replay::BeginRecord() {
 	char tmppath[40];
 	strftime(tmppath, 40, "./replay/%Y-%m-%d %H-%M-%S %%u.yrp", localedtime);
 	char path[40];
-	sprintf(path, tmppath, aServerPort);
+	sprintf(path, tmppath, server_port);
 	fp = fopen(path, "wb");
 #else
 	fp = fopen("./replay/_LastReplay.yrp", "wb");