Skip to content

Y
ygopro-2pick
Commit 13b4804c authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 74dcb425 9026d9f8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
cards.cdb
View file @ 13b4804c
No preview for this file type
gframe/game.cpp
View file @ 13b4804c
...@@ -1603,6 +1603,9 @@ void Game::AddChatMsg(wchar_t* msg, int player) { ...@@ -1603,6 +1603,9 @@ void Game::AddChatMsg(wchar_t* msg, int player) {
chatMsg[0].append(L"[---]: "); chatMsg[0].append(L"[---]: ");
} }
chatMsg[0].append(msg); 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() { void Game::ClearChatMsg() {
for(int i = 7; i >= 0; --i) { for(int i = 7; i >= 0; --i) {
......
ocgcore @ 6866f7cb
Subproject commit 7f4917217ee03c569352c22addd3bd1804b7ea7a Subproject commit 6866f7cbff63261b09c81f5d21f18fb4fa28cfd7
script @ 8cc6563b
Subproject commit 147ef4015e2f217c52809b1a3362746fc4564174 Subproject commit 8cc6563b8f5103d61dc94a001dba18fc4cc95d48
strings.conf
View file @ 13b4804c
...@@ -240,6 +240,9 @@ ...@@ -240,6 +240,9 @@
!system 1161 效果处理 !system 1161 效果处理
!system 1162 效果重置 !system 1162 效果重置
!system 1163 灵摆召唤 !system 1163 灵摆召唤
!system 1164 同调召唤
!system 1165 超量召唤
!system 1166 连接召唤
#menu #menu
!system 1200 联机模式 !system 1200 联机模式
!system 1201 单人模式 !system 1201 单人模式
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment