Skip to content

Y
ygopro
Commit 9aa4e22b authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro

parents 8a44b4e1 7123d072
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
gframe/duelclient.cpp
View file @ 9aa4e22b
...@@ -2220,7 +2220,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2220,7 +2220,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
return true; return true;
} }
case MSG_FIELD_DISABLED: { case MSG_FIELD_DISABLED: {
int disabled = BufferIO::ReadInt32(pbuf); unsigned int disabled = BufferIO::ReadInt32(pbuf);
if (!mainGame->dInfo.isFirst) if (!mainGame->dInfo.isFirst)
disabled = (disabled >> 16) | (disabled << 16); disabled = (disabled >> 16) | (disabled << 16);
mainGame->dField.disabled_field = disabled; mainGame->dField.disabled_field = disabled;
......
gframe/game.cpp
View file @ 9aa4e22b
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <dirent.h> #include <dirent.h>
#endif #endif
const unsigned short PRO_VERSION = 0x133B; const unsigned short PRO_VERSION = 0x133C;
namespace ygo { namespace ygo {
......
ocgcore @ 800ecbbf
Subproject commit 0f903247f51851bbef5ca0eda1fe22cd98607317 Subproject commit 800ecbbf27bab7de6de02cf610946b678b2ff047
script @ 6505dc22
Subproject commit 3e54309aff9f9ab32a52e72e76427d19aa5b84c7 Subproject commit 6505dc223d9754281c1b5bbd8605effdff33ff8a
strings.conf
View file @ 9aa4e22b
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
!system 530 请选择对方的卡 !system 530 请选择对方的卡
!system 531 请选择上级召唤用需要解放的怪兽 !system 531 请选择上级召唤用需要解放的怪兽
!system 532 请选择要取除超量素材的怪兽 !system 532 请选择要取除超量素材的怪兽
!system 549 请选择攻击的对象
!system 550 请选择要发动的效果 !system 550 请选择要发动的效果
!system 551 请选择效果的对象 !system 551 请选择效果的对象
!system 552 请选择硬币的正反面 !system 552 请选择硬币的正反面
......
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