Skip to content

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

Merge branch 'nolink' into another

parents 8d85655e 65ccf50b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 105 deletions
gframe/duelclient.cpp
View file @ fd2a00c6
......@@ -1524,12 +1524,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.selected_cards.clear();
int c, l, s, ss;
unsigned int code;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
int seq_count = 0;
bool panelmode = true;
#else
bool panelmode = false;
#endif
mainGame->dField.select_ready = false;
ClientCard* pcard;
for (int i = 0; i < count1; ++i) {
......@@ -1549,9 +1544,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
if (code != 0 && pcard->code != code)
pcard->SetCode(code);
pcard->select_seq = i;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
seq_count = i;
#endif
mainGame->dField.selectable_cards.push_back(pcard);
pcard->is_selectable = true;
pcard->is_selected = false;
......@@ -1576,109 +1568,12 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
if (code != 0 && pcard->code != code)
pcard->SetCode(code);
pcard->select_seq = i;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
seq_count = i;
#endif
mainGame->dField.selectable_cards.push_back(pcard);
pcard->is_selectable = true;
pcard->is_selected = true;
if (l & 0xf1)
panelmode = true;
}
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
for(int i = 0; i < 2; ++i) {
for(auto cit = mainGame->dField.deck[i].begin(); cit != mainGame->dField.deck[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.hand[i].begin(); cit != mainGame->dField.hand[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.mzone[i].begin(); cit != mainGame->dField.mzone[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.szone[i].begin(); cit != mainGame->dField.szone[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.grave[i].begin(); cit != mainGame->dField.grave[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.remove[i].begin(); cit != mainGame->dField.remove[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.extra[i].begin(); cit != mainGame->dField.extra[i].end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
}
for(auto cit = mainGame->dField.limbo_temp.begin(); cit != mainGame->dField.limbo_temp.end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
for(auto cit = mainGame->dField.overlay_cards.begin(); cit != mainGame->dField.overlay_cards.end(); ++cit) {
ClientCard* scard = (*cit);
if(!scard->is_selectable) {
seq_count++;
scard->select_seq = seq_count;
mainGame->dField.selectable_cards.push_back(scard);
scard->is_selectable = true;
scard->is_selected = false;
}
}
#endif
std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort);
if(select_hint)
myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetDesc(select_hint),
......
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