Skip to content

Y
ygopro-2pick
Commit 4ee8fb1d authored by DailyShana's avatar DailyShana
Browse files
Options

format

parent 9cf3f315
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
gframe/deck_con.cpp
View file @ 4ee8fb1d
...@@ -193,8 +193,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -193,8 +193,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
deckManager.current_deck.main.clear(); deckManager.current_deck.main.clear();
deckManager.current_deck.extra.clear(); deckManager.current_deck.extra.clear();
deckManager.current_deck.side.clear(); deckManager.current_deck.side.clear();
} } else if(is_deleting) {
else if(is_deleting) {
int sel = mainGame->cbDBDecks->getSelected(); int sel = mainGame->cbDBDecks->getSelected();
if (deckManager.DeleteDeck(deckManager.current_deck, mainGame->cbDBDecks->getItem(sel))) { if (deckManager.DeleteDeck(deckManager.current_deck, mainGame->cbDBDecks->getItem(sel))) {
mainGame->cbDBDecks->removeItem(sel); mainGame->cbDBDecks->removeItem(sel);
...@@ -603,14 +602,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -603,14 +602,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
deckManager.current_deck.main.push_back(draging_pointer); deckManager.current_deck.main.push_back(draging_pointer);
else if (deckManager.current_deck.side.size() < 15) else if (deckManager.current_deck.side.size() < 15)
deckManager.current_deck.side.push_back(draging_pointer); deckManager.current_deck.side.push_back(draging_pointer);
} } else if (hovered_pos == 2) {
else if (hovered_pos == 2) {
if (deckManager.current_deck.extra.size() < 15) if (deckManager.current_deck.extra.size() < 15)
deckManager.current_deck.extra.push_back(draging_pointer); deckManager.current_deck.extra.push_back(draging_pointer);
else if (deckManager.current_deck.side.size() < 15) else if (deckManager.current_deck.side.size() < 15)
deckManager.current_deck.side.push_back(draging_pointer); deckManager.current_deck.side.push_back(draging_pointer);
} } else if (hovered_pos == 3) {
else if (hovered_pos == 3) {
if (deckManager.current_deck.side.size() < 15) if (deckManager.current_deck.side.size() < 15)
deckManager.current_deck.side.push_back(draging_pointer); deckManager.current_deck.side.push_back(draging_pointer);
else { else {
...@@ -619,8 +616,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -619,8 +616,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60) else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60)
deckManager.current_deck.main.push_back(draging_pointer); deckManager.current_deck.main.push_back(draging_pointer);
} }
} } else {
else {
if ((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15) if ((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15)
deckManager.current_deck.extra.push_back(draging_pointer); deckManager.current_deck.extra.push_back(draging_pointer);
else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60) else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60)
......
gframe/duelclient.cpp
View file @ 4ee8fb1d
...@@ -1860,8 +1860,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1860,8 +1860,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->btnChainAlways->setVisible(true); mainGame->btnChainAlways->setVisible(true);
mainGame->btnChainWhenAvail->setVisible(true); mainGame->btnChainWhenAvail->setVisible(true);
mainGame->dField.UpdateChainButtons(); mainGame->dField.UpdateChainButtons();
} } else {
else {
mainGame->btnChainIgnore->setVisible(false); mainGame->btnChainIgnore->setVisible(false);
mainGame->btnChainAlways->setVisible(false); mainGame->btnChainAlways->setVisible(false);
mainGame->btnChainWhenAvail->setVisible(false); mainGame->btnChainWhenAvail->setVisible(false);
......
ocgcore @ 0131b0b8
Subproject commit bdfe3d7c4db18f1b66f0cab7874108411571bff2 Subproject commit 0131b0b8914b3da4921ce4d416b4563f9cbedf9b
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