Skip to content

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

revert all cards

parent 25320a7d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 11 deletions
gframe/duelclient.cpp
View file @ b7a5d495
...@@ -1524,12 +1524,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1524,12 +1524,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.selected_cards.clear(); mainGame->dField.selected_cards.clear();
int c, l, s, ss; int c, l, s, ss;
unsigned int code; unsigned int code;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
int seq_count = 0;
bool panelmode = true;
#else
bool panelmode = false; bool panelmode = false;
#endif
mainGame->dField.select_ready = false; mainGame->dField.select_ready = false;
ClientCard* pcard; ClientCard* pcard;
for (int i = 0; i < count1; ++i) { for (int i = 0; i < count1; ++i) {
...@@ -1549,9 +1544,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1549,9 +1544,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
if (code != 0 && pcard->code != code) if (code != 0 && pcard->code != code)
pcard->SetCode(code); pcard->SetCode(code);
pcard->select_seq = i; pcard->select_seq = i;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
seq_count = i;
#endif
mainGame->dField.selectable_cards.push_back(pcard); mainGame->dField.selectable_cards.push_back(pcard);
pcard->is_selectable = true; pcard->is_selectable = true;
pcard->is_selected = false; pcard->is_selected = false;
...@@ -1576,15 +1568,13 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1576,15 +1568,13 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
if (code != 0 && pcard->code != code) if (code != 0 && pcard->code != code)
pcard->SetCode(code); pcard->SetCode(code);
pcard->select_seq = i; pcard->select_seq = i;
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
seq_count = i;
#endif
mainGame->dField.selectable_cards.push_back(pcard); mainGame->dField.selectable_cards.push_back(pcard);
pcard->is_selectable = true; pcard->is_selectable = true;
pcard->is_selected = true; pcard->is_selected = true;
if (l & 0xf1) if (l & 0xf1)
panelmode = true; panelmode = true;
} }
<<<<<<< HEAD
#ifdef YGOPRO_IGNORE_SELECT_UNSELECT #ifdef YGOPRO_IGNORE_SELECT_UNSELECT
for(int i = 0; i < 2; ++i) { for(int i = 0; i < 2; ++i) {
for(auto cit = mainGame->dField.deck[i].begin(); cit != mainGame->dField.deck[i].end(); ++cit) { for(auto cit = mainGame->dField.deck[i].begin(); cit != mainGame->dField.deck[i].end(); ++cit) {
...@@ -1679,6 +1669,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1679,6 +1669,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} }
} }
#endif #endif
=======
>>>>>>> parent of abc6f61c... enable selecting all cards
std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort); std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort);
if(select_hint) if(select_hint)
myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetDesc(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