Commit 5879e2c7 authored by mercury233's avatar mercury233

fix SERVER_TAG_SURRENDER_CONFIRM

parent 6a977bfc
...@@ -29,6 +29,9 @@ if SERVER_MODE then ...@@ -29,6 +29,9 @@ if SERVER_MODE then
if SERVER_PRO2_SUPPORT then if SERVER_PRO2_SUPPORT then
defines { "SERVER_PRO2_SUPPORT" } defines { "SERVER_PRO2_SUPPORT" }
end end
if SERVER_TAG_SURRENDER_CONFIRM then
defines { "SERVER_TAG_SURRENDER_CONFIRM" }
end
else else
kind "WindowedApp" kind "WindowedApp"
......
...@@ -679,7 +679,7 @@ void TagDuel::Surrender(DuelPlayer* dp) { ...@@ -679,7 +679,7 @@ void TagDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 3 || !pduel) if(dp->type > 3 || !pduel)
return; return;
uint32 player = dp->type; uint32 player = dp->type;
#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_TAG_SURRENDER_CONFIRM) #if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_TAG_SURRENDER_CONFIRM)
if(surrender[player]) if(surrender[player])
return; return;
static const uint32 teammatemap[] = { 1, 0, 3, 2 }; static const uint32 teammatemap[] = { 1, 0, 3, 2 };
......
...@@ -12,6 +12,7 @@ LUA_LIB_NAME = "lua" ...@@ -12,6 +12,7 @@ LUA_LIB_NAME = "lua"
SERVER_MODE = true SERVER_MODE = true
SERVER_ZIP_SUPPORT = false SERVER_ZIP_SUPPORT = false
SERVER_PRO2_SUPPORT = false SERVER_PRO2_SUPPORT = false
SERVER_TAG_SURRENDER_CONFIRM = false
USE_IRRKLANG = false USE_IRRKLANG = false
-- read settings from command line or environment variables -- read settings from command line or environment variables
...@@ -60,11 +61,11 @@ newoption { trigger = "mac-arm", category = "YGOPro", description = "M1" } ...@@ -60,11 +61,11 @@ newoption { trigger = "mac-arm", category = "YGOPro", description = "M1" }
newoption { trigger = "server-mode", category = "YGOPro - server", description = "" } newoption { trigger = "server-mode", category = "YGOPro - server", description = "" }
newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
newoption { trigger = "server-pro2-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-pro2-support", category = "YGOPro - server", description = "" }
newoption { trigger = "server-tag-surrender-confirm", category = "YGOPro - server", description = "" }
boolOptions = { boolOptions = {
"no-lua-safe", "no-lua-safe",
"no-side-check", "no-side-check"
"tag-surrender-confirm"
} }
for _, boolOption in ipairs(boolOptions) do for _, boolOption in ipairs(boolOptions) do
...@@ -205,7 +206,6 @@ if GetParam("mac-arm") and os.istarget("macosx") then ...@@ -205,7 +206,6 @@ if GetParam("mac-arm") and os.istarget("macosx") then
end end
if GetParam("server-mode") then if GetParam("server-mode") then
SERVER_MODE = true SERVER_MODE = true
SERVER_ZIP_SUPPORT = false
end end
if GetParam("server-zip-support") then if GetParam("server-zip-support") then
SERVER_ZIP_SUPPORT = true SERVER_ZIP_SUPPORT = true
...@@ -214,6 +214,9 @@ if GetParam("server-pro2-support") then ...@@ -214,6 +214,9 @@ if GetParam("server-pro2-support") then
SERVER_PRO2_SUPPORT = true SERVER_PRO2_SUPPORT = true
SERVER_ZIP_SUPPORT = true SERVER_ZIP_SUPPORT = true
end end
if GetParam("server-tag-surrender-confirm") then
SERVER_TAG_SURRENDER_CONFIRM = true
end
workspace "YGOPro" workspace "YGOPro"
location "build" location "build"
......
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