Skip to content

Y
ygopro
Commit 99ba292e authored by nanahira's avatar nanahira
Browse files
Options

fix merge

parent af3ada8e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
gframe/single_duel.cpp
View file @ 99ba292e
...@@ -1933,7 +1933,6 @@ inline int SingleDuel::WriteUpdateData(int& player, int location, int& flag, uns ...@@ -1933,7 +1933,6 @@ inline int SingleDuel::WriteUpdateData(int& player, int location, int& flag, uns
int len = query_field_card(pduel, player, location, flag, qbuf, use_cache); int len = query_field_card(pduel, player, location, flag, qbuf, use_cache);
return len; return len;
} }
void SingleDuel::RefreshMzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
void SingleDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp) void SingleDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp)
#else #else
......
gframe/tag_duel.cpp
View file @ 99ba292e
...@@ -2043,7 +2043,6 @@ inline int TagDuel::WriteUpdateData(int& player, int location, int& flag, unsign ...@@ -2043,7 +2043,6 @@ inline int TagDuel::WriteUpdateData(int& player, int location, int& flag, unsign
int len = query_field_card(pduel, player, location, flag, qbuf, use_cache); int len = query_field_card(pduel, player, location, flag, qbuf, use_cache);
return len; return len;
} }
void TagDuel::RefreshMzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
void TagDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp) void TagDuel::RefreshMzone(int player, int flag, int use_cache, DuelPlayer* dp)
#else #else
......
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