Merge branch 'server' of git.mycard.moe:nanahira/ygopro into server-develop

gframe/single_duel.cpp

@@ -404,7 +404,12 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 		valid = false;
 	else if (sidec < 0 || sidec > SIDEC_MAX)
 		valid = false;
-	else if (deck_size != (mainc + sidec) * (int)sizeof(int32_t))
+	else if
+#ifdef YGOPRO_SERVER_MODE
+(deck_size < (mainc + sidec) * (int)sizeof(int32_t) || deck_size > MAINC_MAX + SIDEC_MAX)
+#else
+(deck_size != (mainc + sidec) * (int)sizeof(int32_t))
+#endif
 		valid = false;
 	if (!valid) {
 		STOC_ErrorMsg scem;

gframe/tag_duel.cpp

@@ -390,7 +390,12 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 		valid = false;
 	else if (sidec < 0 || sidec > SIDEC_MAX)
 		valid = false;
-	else if (deck_size != (mainc + sidec) * (int)sizeof(int32_t))
+	else if
+#ifdef YGOPRO_SERVER_MODE
+(deck_size < (mainc + sidec) * (int)sizeof(int32_t) || deck_size > MAINC_MAX + SIDEC_MAX)
+#else
+(deck_size != (mainc + sidec) * (int)sizeof(int32_t))
+#endif
 		valid = false;
 	if (!valid) {
 		STOC_ErrorMsg scem;

ocgcore @ f2b08bd8

-Subproject commit d4430f0ae3f415b322bd58de7b3c3fdec849feb3
+Subproject commit f2b08bd829e232bf623456f80d5b2d82f8d7eb3e

premake5.lua

@@ -68,6 +68,7 @@ boolOptions = {
     "no-lua-safe",
     "message-debug",
     "no-side-check",
+    "enable-debug-func"
 }
 
 for _, boolOption in ipairs(boolOptions) do

script @ eccdab43

-Subproject commit 6aff241a80b38289696a1fc52b7fcc754f6eb4b5
+Subproject commit eccdab4349138c7c4aa1f2f44ea994dfa98c0b79

strings.conf

@@ -139,6 +139,7 @@
 !system 572 请选择要放置指示物的卡
 !system 573 请选择要无效的卡
 !system 574 请选择要操作的卡
+!system 575 请选择场上的卡（按取消可选择其他区域的卡）
 !system 1000 卡组
 !system 1001 手卡
 !system 1002 怪兽区