Merge branch 'master' into server

13b4804c · nanahira · 74dcb425 · 9026d9f8 · 13b4804c · 13b4804c
Commit 13b4804c authored Apr 29, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

cards.cdb cards.cdb +0 -0

gframe/game.cpp gframe/game.cpp +3 -0

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +3 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1603,6 +1603,9 @@ void Game::AddChatMsg(wchar_t* msg, int player) {
 			chatMsg[0].append(L"[---]: ");
 	}
 	chatMsg[0].append(msg);
+	wchar_t msg_front[256];
+	myswprintf(msg_front, L"[Chat]%ls", chatMsg[0].c_str());
+	lstLog->addItem(msg_front);
 }
 void Game::ClearChatMsg() {
 	for(int i = 7; i >= 0; --i) {

--- a/ocgcore @ 6866f7cb
+++ b/ocgcore @ 6866f7cb
-Subproject commit 7f4917217ee03c569352c22addd3bd1804b7ea7a
+Subproject commit 6866f7cbff63261b09c81f5d21f18fb4fa28cfd7
--- a/script @ 8cc6563b
+++ b/script @ 8cc6563b
-Subproject commit 147ef4015e2f217c52809b1a3362746fc4564174
+Subproject commit 8cc6563b8f5103d61dc94a001dba18fc4cc95d48
--- a/strings.conf
+++ b/strings.conf
@@ -240,6 +240,9 @@
 !system 1161 效果处理
 !system 1162 效果重置
 !system 1163 灵摆召唤
+!system 1164 同调召唤
+!system 1165 超量召唤
+!system 1166 连接召唤
 #menu
 !system 1200 联机模式
 !system 1201 单人模式