add server log in chat, now for mdpro3

.gitlab-ci.yml

@@ -129,7 +129,7 @@ exec_windows:
 exec_windows_pro3:
   extends: .exec_windows
   script:
-    - '.\premake5.exe vs2019 --server-pro3-support'
+    - '.\premake5.exe vs2019 --server-pro3-support --log-in-chat'
     - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
     - mkdir dist
     - mkdir dist\windows
@@ -191,11 +191,13 @@ exec_windows_pro3:
   image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic
   variables:
     SERVER_PRO3_SUPPORT: '1'
+    LOG_IN_CHAT: '1'
     TARGET_FILE: libygoserver.so
 
 .use_pro3_macos:
   variables:
     SERVER_PRO3_SUPPORT: '1'
+    LOG_IN_CHAT: '1'
     TARGET_FILE: libygoserver.dylib
     LIBEVENT_PREBUILD_FLAGS: '-fPIC'
 

gframe/game.cpp

@@ -2072,6 +2072,17 @@ void Game::ClearChatMsg() {
 }
 #endif //YGOPRO_SERVER_MODE
 void Game::AddDebugMsg(const char* msg) {
+#ifdef YGOPRO_LOG_IN_CHAT
+	wchar_t msgbuf_w[1024];
+	wchar_t msgbuf_w2[1024];
+	uint16_t msgbuf_u16[LEN_CHAT_MSG];
+	BufferIO::DecodeUTF8(msg, msgbuf_w);
+	myswprintf(msgbuf_w2, L"[Script Error]: %ls", msgbuf_w); // prefix for debug messages
+	auto len = BufferIO::CopyCharArray(msgbuf_w2, msgbuf_u16);
+	DuelPlayer tmp_dp;
+	tmp_dp.type = 11;
+	NetServer::duel_mode->Chat(&tmp_dp, (unsigned char*)msgbuf_u16, (len + 1) * sizeof(uint16_t)); // send to chat log
+#endif
 #ifdef YGOPRO_SERVER_MODE
 	fprintf(stderr, "%s\n", msg);
 #else

gframe/netserver.h

@@ -15,11 +15,16 @@ private:
 #endif
 	static event* broadcast_ev;
 	static evconnlistener* listener;
+#ifndef YGOPRO_LOG_IN_CHAT
 	static DuelMode* duel_mode;
+#endif
 	static unsigned char net_server_write[SIZE_NETWORK_BUFFER];
 	static size_t last_sent;
 
 public:
+#ifdef YGOPRO_LOG_IN_CHAT
+	static DuelMode* duel_mode;
+#endif
 #ifdef YGOPRO_SERVER_MODE
 	static event_base* net_evbase;
 	static void InitDuel();

premake5.lua

@@ -113,6 +113,7 @@ boolOptions = {
     "no-side-check",
     "enable-debug-func",
     "log-lua-memory-size",
+    "log-in-chat",
 }
 
 for _, boolOption in ipairs(boolOptions) do