Skip to content

Y
ygopro
Commit 402a0010 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'nolink' into another

parents 694d732c 96e6b019
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
gframe/duelclient.cpp
View file @ 402a0010
......@@ -1587,7 +1587,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
}
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
for(int i = 0; i < 2; ++i) {
for(auto cit = deck[i].begin(); cit != deck[i].end(); ++cit) {
for(auto cit = mainGame->dField.deck[i].begin(); cit != mainGame->dField.deck[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1597,7 +1597,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = hand[i].begin(); cit != hand[i].end(); ++cit) {
for(auto cit = mainGame->dField.hand[i].begin(); cit != mainGame->dField.hand[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1607,7 +1607,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = mzone[i].begin(); cit != mzone[i].end(); ++cit) {
for(auto cit = mainGame->dField.mzone[i].begin(); cit != mainGame->dField.mzone[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1617,7 +1617,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = szone[i].begin(); cit != szone[i].end(); ++cit) {
for(auto cit = mainGame->dField.szone[i].begin(); cit != mainGame->dField.szone[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1627,7 +1627,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = grave[i].begin(); cit != grave[i].end(); ++cit) {
for(auto cit = mainGame->dField.grave[i].begin(); cit != mainGame->dField.grave[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1637,7 +1637,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = remove[i].begin(); cit != remove[i].end(); ++cit) {
for(auto cit = mainGame->dField.remove[i].begin(); cit != mainGame->dField.remove[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1647,7 +1647,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto cit = extra[i].begin(); cit != extra[i].end(); ++cit) {
for(auto cit = mainGame->dField.extra[i].begin(); cit != mainGame->dField.extra[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1658,7 +1658,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
}
}
}
for(auto cit = limbo_temp.begin(); cit != limbo_temp.end(); ++cit) {
for(auto cit = mainGame->dField.limbo_temp.begin(); cit != mainGame->dField.limbo_temp.end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......@@ -1668,7 +1668,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
scard->is_selected = false;
}
}
for(auto sit = overlay_cards.begin(); sit != overlay_cards.end(); ++sit) {
for(auto sit = mainGame->dField.overlay_cards.begin(); sit != mainGame->dField.overlay_cards.end(); ++sit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
......
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