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

gframe/client_card.cpp

@@ -155,19 +155,13 @@ void ClientCard::UpdateInfo(char* buf) {
 	if(flag & QUERY_IS_PUBLIC)
 		is_public = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_LSCALE) {
-		pdata = BufferIO::ReadInt32(buf);
-		if(pdata && lscale != (unsigned int)pdata) {
-			lscale = pdata;
+		lscale = BufferIO::ReadInt32(buf);
 		myswprintf(lscstring, L"%d", lscale);
 	}
-	}
 	if(flag & QUERY_RSCALE) {
-		pdata = BufferIO::ReadInt32(buf);
-		if(pdata && rscale != (unsigned int)pdata) {
-			rscale = pdata;
+		rscale = BufferIO::ReadInt32(buf);
 		myswprintf(rscstring, L"%d", rscale);
 	}
-	}
 }
 void ClientCard::ClearTarget() {
 	for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) {

strings.conf

@@ -789,3 +789,5 @@
 !setname 0xf3 捕食	プレデター
 !setname 0x10f3 捕食植物
 !setname 0xf4 召唤兽	召喚獣
+!setname 0xf5 甘多拉	ガンドラ
+!setname 0xf6 摩天楼