Skip to content

Y
ygopro
Commit 2148301e authored by mercury233's avatar mercury233
Browse files
Options

Merge https://github.com/Fluorohydride/ygopro into server

parents aea85e7a 506c0076
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
gframe/event_handler.cpp
View file @ 2148301e
......@@ -577,9 +577,16 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
command_card = selectable_cards[id - BUTTON_CARD_0 + mainGame->scrCardList->getPos() / 10];
selected_cards.push_back(command_card);
if (CheckSelectSum()) {
SetResponseSelectedCards();
mainGame->HideElement(mainGame->wCardSelect, true);
if(selectsum_cards.size() == 0 || selectable_cards.size() == 0) {
SetResponseSelectedCards();
mainGame->HideElement(mainGame->wCardSelect, true);
} else {
select_ready = true;
mainGame->wCardSelect->setVisible(false);
mainGame->dField.ShowSelectCard(true);
}
} else {
select_ready = false;
mainGame->wCardSelect->setVisible(false);
mainGame->dField.ShowSelectCard();
}
......@@ -628,7 +635,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->HideElement(mainGame->wCardSelect);
break;
}
if(mainGame->dInfo.curMsg == MSG_SELECT_CARD) {
if(mainGame->dInfo.curMsg == MSG_SELECT_CARD || mainGame->dInfo.curMsg == MSG_SELECT_SUM) {
if(select_ready) {
SetResponseSelectedCards();
mainGame->HideElement(mainGame->wCardSelect, true);
......
ocgcore @ fd3c5b56
Subproject commit 022a70f63132887762e1628b836d01e1eb89f74d
Subproject commit fd3c5b56eb50a8bbd9c53bb8d54f18a7452d46ee
script @ b6d542dc
Subproject commit e2b56aa5251141aa744c9c1d10ed50ecafd99da9
Subproject commit b6d542dce9a7eb4a46d4c219203f754fabec3d3e
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