Commit 4ad08898 authored by nanahira's avatar nanahira

Revert "migrate SERVER_TAG_SURRENDER_CONFIRM to premake boolOptions"

This reverts commit 398bb2bd.
parent 398bb2bd
...@@ -30,6 +30,9 @@ if SERVER_MODE then ...@@ -30,6 +30,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"
cppdialect "C++14" cppdialect "C++14"
......
...@@ -668,7 +668,7 @@ void TagDuel::Surrender(DuelPlayer* dp) { ...@@ -668,7 +668,7 @@ void TagDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 3 || !pduel) if(dp->type > 3 || !pduel)
return; return;
uint32_t player = dp->type; uint32_t player = dp->type;
#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_SERVER_TAG_SURRENDER_CONFIRM) #if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_TAG_SURRENDER_CONFIRM)
if(surrender[player]) if(surrender[player])
return; return;
static const uint32_t teammatemap[] = { 1, 0, 3, 2 }; static const uint32_t teammatemap[] = { 1, 0, 3, 2 };
......
...@@ -30,6 +30,7 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false ...@@ -30,6 +30,7 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false
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
-- Read settings from command line or environment variables -- Read settings from command line or environment variables
...@@ -95,12 +96,11 @@ newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile f ...@@ -95,12 +96,11 @@ newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile f
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"
"server-tag-surrender-confirm",
"server-receive-ready",
} }
for _, boolOption in ipairs(boolOptions) do for _, boolOption in ipairs(boolOptions) do
...@@ -155,6 +155,9 @@ if GetParam("server-pro2-support") then ...@@ -155,6 +155,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
if GetParam("build-lua") then if GetParam("build-lua") then
BUILD_LUA = true BUILD_LUA = true
......
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