Skip to content

Y
ygopro
Commit 4ecd0e8b authored by nanahira's avatar nanahira
Browse files
Options

fix

parent 1986c0af
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
gframe/tag_duel.cpp
View file @ 4ecd0e8b
...@@ -680,11 +680,7 @@ void TagDuel::Surrender(DuelPlayer* dp) { ...@@ -680,11 +680,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;
<<<<<<< HEAD
#ifndef YGOPRO_SERVER_MODE
=======
#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_TAG_SURRENDER_CONFIRM) #if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_TAG_SURRENDER_CONFIRM)
>>>>>>> fbf1f188020a6ecffedddbe5cf2cf7b00a8269fc
if(surrender[player]) if(surrender[player])
return; return;
static const uint32 teammatemap[] = { 1, 0, 3, 2 }; static const uint32 teammatemap[] = { 1, 0, 3, 2 };
......
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