Skip to content

Y
ygopro
Commit 06f6df7e authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents e82194cd b6fa972e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
gframe/single_duel.cpp
View file @ 06f6df7e
...@@ -254,11 +254,7 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) { ...@@ -254,11 +254,7 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
unsigned char wbuf[3]; unsigned char wbuf[3];
wbuf[0] = MSG_WIN; wbuf[0] = MSG_WIN;
wbuf[1] = 1 - dp->type; wbuf[1] = 1 - dp->type;
#ifdef YGOPRO_SERVER_MODE wbuf[2] = 0x4;
wbuf[2] = 4;
#else
wbuf[2] = 0;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, wbuf, 3); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, wbuf, 3);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
...@@ -403,7 +399,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) { ...@@ -403,7 +399,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) {
if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) { if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) {
STOC_ErrorMsg scem; STOC_ErrorMsg scem;
scem.msg = ERRMSG_DECKERROR; scem.msg = ERRMSG_DECKERROR;
scem.code = DECKERROR_MAINCOUNT << 28; scem.code = 0;
NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem); NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem);
return; return;
} }
......
gframe/tag_duel.cpp
View file @ 06f6df7e
...@@ -381,7 +381,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) { ...@@ -381,7 +381,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) {
if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) { if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) {
STOC_ErrorMsg scem; STOC_ErrorMsg scem;
scem.msg = ERRMSG_DECKERROR; scem.msg = ERRMSG_DECKERROR;
scem.code = DECKERROR_MAINCOUNT << 28; scem.code = 0;
NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem); NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem);
return; return;
} }
......
ocgcore @ 7f4c255a
Subproject commit d60121340f49d4b7b57ec2ff0c95623bb64200e3 Subproject commit 7f4c255aae967d5d7ebed95c8f5cb291f22bd178
script @ 4ee3551e
Subproject commit 35562e466d6ae7816bf32a2cc2b5bc37deed4aaa Subproject commit 4ee3551e3be02d6527a62b2d473b9c3740516963
strings.conf
View file @ 06f6df7e
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
!system 72 陷阱卡 !system 72 陷阱卡
!system 80 进入战斗阶段 !system 80 进入战斗阶段
!system 81 进入结束阶段 !system 81 进入结束阶段
!system 90 是否不解放怪物通常召唤？ !system 90 是否不解放怪兽通常召唤？
!system 91 是否使用额外的召唤机会？ !system 91 是否使用额外的召唤机会？
!system 92 是否要解放对方怪兽进行上级召唤？ !system 92 是否要解放对方怪兽进行上级召唤？
!system 93 是否要继续选择素材？ !system 93 是否要继续选择素材？
......
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