Commit 5c2835da authored by nanahira's avatar nanahira

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

parents 254a3d54 5d271ad0
Pipeline #38139 failed with stages
in 108 minutes and 54 seconds
......@@ -437,7 +437,7 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
duel_mode->ToObserver(dp);
break;
}
#if defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#ifdef YGOPRO_SERVER_MODE
case CTOS_HS_NOTREADY: {
if (!duel_mode || duel_mode->pduel)
return;
......
......@@ -39,6 +39,9 @@ end
if SERVER_PRO2_SUPPORT then
defines { "SERVER_PRO2_SUPPORT" }
end
if SERVER_TAG_SURRENDER_CONFIRM then
defines { "SERVER_TAG_SURRENDER_CONFIRM" }
end
else
project "ygopro"
kind "WindowedApp"
......
......@@ -408,7 +408,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
#endif
valid = false;
if (!valid) {
#if defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#ifdef YGOPRO_SERVER_MODE
if(duel_count == 0) {
STOC_HS_PlayerChange scpc;
scpc.status = (dp->type << 4) | PLAYERCHANGE_NOTREADY;
......@@ -423,7 +423,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
}
if(duel_count == 0) {
deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
#if defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#ifdef YGOPRO_SERVER_MODE
PlayerReady(dp, true);
#endif
} else {
......
......@@ -394,7 +394,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
#endif
valid = false;
if (!valid) {
#if defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#ifdef YGOPRO_SERVER_MODE
STOC_HS_PlayerChange scpc;
scpc.status = (dp->type << 4) | PLAYERCHANGE_NOTREADY;
NetServer::SendPacketToPlayer(dp, STOC_HS_PLAYER_CHANGE, scpc);
......@@ -406,7 +406,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
return;
}
deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
#if defined(YGOPRO_SERVER_MODE) && !defined(YGOPRO_SERVER_RECEIVE_READY)
#ifdef YGOPRO_SERVER_MODE
PlayerReady(dp, true);
#endif
}
......@@ -736,7 +736,7 @@ void TagDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 3 || !pduel)
return;
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])
return;
static const uint32_t teammatemap[] = { 1, 0, 3, 2 };
......
......@@ -29,6 +29,7 @@ IRRKLANG_PRO_BUILD_IKPMP3 = false
SERVER_MODE = true
SERVER_ZIP_SUPPORT = false
SERVER_PRO2_SUPPORT = false
SERVER_TAG_SURRENDER_CONFIRM = false
SERVER_PRO3_SUPPORT = false
USE_IRRKLANG = false
......@@ -97,6 +98,7 @@ 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 = "" }
newoption { trigger = "server-pro3-support", category = "YGOPro - server", description = "" }
newoption { trigger = "server-tag-surrender-confirm", category = "YGOPro - server", description = "" }
boolOptions = {
"compat-mycard",
......@@ -106,8 +108,6 @@ boolOptions = {
"enable-debug-func",
"log-lua-memory-size",
"log-in-chat",
"server-tag-surrender-confirm",
"server-receive-ready",
}
for _, boolOption in ipairs(boolOptions) do
......@@ -170,6 +170,9 @@ if GetParam("server-pro3-support") then
SERVER_ZIP_SUPPORT = true
SERVER_TAG_SURRENDER_CONFIRM = true
end
if GetParam("server-tag-surrender-confirm") then
SERVER_TAG_SURRENDER_CONFIRM = true
end
if GetParam("build-lua") then
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