Skip to content

Y
ygopro
Commit 455d0090 authored by mercury233's avatar mercury233
Browse files
Options

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

parents 8644512c 2759c0b6
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
gframe/client_card.cpp
View file @ 455d0090
...@@ -155,19 +155,13 @@ void ClientCard::UpdateInfo(char* buf) { ...@@ -155,19 +155,13 @@ void ClientCard::UpdateInfo(char* buf) {
if(flag & QUERY_IS_PUBLIC) if(flag & QUERY_IS_PUBLIC)
is_public = BufferIO::ReadInt32(buf); is_public = BufferIO::ReadInt32(buf);
if(flag & QUERY_LSCALE) { if(flag & QUERY_LSCALE) {
pdata = BufferIO::ReadInt32(buf); lscale = BufferIO::ReadInt32(buf);
if(pdata && lscale != (unsigned int)pdata) {
lscale = pdata;
myswprintf(lscstring, L"%d", lscale); myswprintf(lscstring, L"%d", lscale);
} }
}
if(flag & QUERY_RSCALE) { if(flag & QUERY_RSCALE) {
pdata = BufferIO::ReadInt32(buf); rscale = BufferIO::ReadInt32(buf);
if(pdata && rscale != (unsigned int)pdata) {
rscale = pdata;
myswprintf(rscstring, L"%d", rscale); myswprintf(rscstring, L"%d", rscale);
} }
}
} }
void ClientCard::ClearTarget() { void ClientCard::ClearTarget() {
for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) { for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) {
......
strings.conf
View file @ 455d0090
...@@ -789,3 +789,5 @@ ...@@ -789,3 +789,5 @@
!setname 0xf3 捕食 プレデター !setname 0xf3 捕食 プレデター
!setname 0x10f3 捕食植物 !setname 0x10f3 捕食植物
!setname 0xf4 召唤兽 召喚獣 !setname 0xf4 召唤兽 召喚獣
!setname 0xf5 甘多拉 ガンドラ
!setname 0xf6 摩天楼
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