Merge branch 'server-develop' of ../versions/ygopro-mc into server-develop

gframe/tag_duel.cpp

@@ -680,7 +680,11 @@ void TagDuel::Surrender(DuelPlayer* dp) {
 	if(dp->type > 3 || !pduel)
 		return;
 	uint32 player = dp->type;
+<<<<<<< HEAD
 #ifndef YGOPRO_SERVER_MODE
+=======
+#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_TAG_SURRENDER_CONFIRM)
+>>>>>>> fbf1f188020a6ecffedddbe5cf2cf7b00a8269fc
 	if(surrender[player])
 		return;
 	static const uint32 teammatemap[] = { 1, 0, 3, 2 };

premake5.lua

@@ -61,13 +61,12 @@ newoption { trigger = "server-mode", category = "YGOPro - server", description =
 newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
 newoption { trigger = "server-pro2-support", category = "YGOPro - server", description = "" }
 
--- koishipro specific
-
 boolOptions = {
     "compat-mycard",
     "no-lua-safe",
     "message-debug",
     "no-side-check",
+    "tag-surrender-confirm",
 }
 
 for _, boolOption in ipairs(boolOptions) do