test

gframe/game.cpp

@@ -1206,8 +1206,12 @@ void Game::AddChatMsg(wchar_t* msg, int player) {
 	}
 	chatMsg[0].append(msg);
 }
+#endif //YGOPRO_SERVER_MODE
 void Game::AddDebugMsg(char* msg)
 {
+#ifdef YGOPRO_SERVER_MODE
+	fprintf(stderr, "%s\n", msg);
+#else
 	if (enable_log & 0x1) {
 		wchar_t wbuf[1024];
 		BufferIO::DecodeUTF8(msg, wbuf);
@@ -1224,7 +1228,9 @@ void Game::AddDebugMsg(char* msg)
 		fprintf(fp, "[%s][Script Error]: %s\n", timebuf, msg);
 		fclose(fp);
 	}
+#endif //YGOPRO_SERVER_MODE
 }
+#ifndef YGOPRO_SERVER_MODE
 void Game::ClearTextures() {
 	matManager.mCard.setTexture(0, 0);
 	mainGame->imgCard->setImage(0);

gframe/game.h

@@ -89,6 +89,7 @@ public:
 #ifdef YGOPRO_SERVER_MODE
 	void MainServerLoop(int mode, int lflist);
 	void LoadExpansionDB();
+	void AddDebugMsg(char* msgbuf);
 #else
 	void MainLoop();
 	void BuildProjectionMatrix(irr::core::matrix4& mProjection, f32 left, f32 right, f32 bottom, f32 top, f32 znear, f32 zfar);

gframe/netserver.cpp

@@ -31,7 +31,7 @@ void NetServer::InitDuel(int mode, int lflist)
 
 	pkt->info.mode = mode;
 
-	if(lflist == -1)
+	if(lflist < 0)
 		pkt->info.lflist = 0;
 	else if(lflist >= deckManager._lfList.size())
 		pkt->info.lflist = deckManager._lfList[0].hash;
@@ -66,13 +66,17 @@ bool NetServer::StartServer(unsigned short port) {
 		net_evbase = 0;
 		return false;
 	}
-	evutil_socket_t fd=evconnlistener_get_fd(listener);
-	socklen_t addrlen=sizeof(struct sockaddr);
-	struct sockaddr_in addr;
-	getsockname(fd,(struct sockaddr*)&addr,&addrlen);
 	evconnlistener_set_error_cb(listener, ServerAcceptError);
 	Thread::NewThread(ServerThread, net_evbase);
+#ifdef YGOPRO_SERVER_MODE
+	evutil_socket_t fd = evconnlistener_get_fd(listener);
+	socklen_t addrlen = sizeof(sockaddr);
+	sockaddr_in addr;
+	getsockname(fd, (sockaddr*)&addr, &addrlen);
 	return ntohs(addr.sin_port);
+#else
+	return true;
+#endif //YGOPRO_SERVER_MODE
 }
 bool NetServer::StartBroadcast() {
 	if(!net_evbase)

gframe/single_duel.cpp

@@ -1709,7 +1709,7 @@ int SingleDuel::MessageHandler(long fduel, int type) {
 		return 0;
 	char msgbuf[1024];
 	get_log_message(fduel, (byte*)msgbuf);
-	fprintf(stderr, "%s\n", msgbuf);
+	mainGame->AddDebugMsg(msgbuf);
 	return 0;
 }
 void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {

gframe/tag_duel.cpp

@@ -1810,7 +1810,7 @@ int TagDuel::MessageHandler(long fduel, int type) {
 		return 0;
 	char msgbuf[1024];
 	get_log_message(fduel, (byte*)msgbuf);
-	fprintf(stderr, "%s\n", msgbuf);
+	mainGame->AddDebugMsg(msgbuf);
 	return 0;
 }
 void TagDuel::TagTimer(evutil_socket_t fd, short events, void* arg) {