Skip to content

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

merge

parent 08f7cbad
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 17 deletions
gframe/menu_handler.cpp
View file @ 54435733
...@@ -522,23 +522,6 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -522,23 +522,6 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
} }
break; break;
} }
case irr::gui::EGET_COMBO_BOX_CHANGED: {
switch(id) {
case COMBOBOX_HP_CATEGORY: {
int catesel = mainGame->cbCategorySelect->getSelected();
if(catesel == 3) {
catesel = 2;
mainGame->cbCategorySelect->setSelected(2);
}
if(catesel >= 0) {
mainGame->RefreshDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
mainGame->cbDeckSelect->setSelected(0);
}
break;
}
}
break;
}
case irr::gui::EGET_CHECKBOX_CHANGED: { case irr::gui::EGET_CHECKBOX_CHANGED: {
switch(id) { switch(id) {
case CHECKBOX_HP_READY: { case CHECKBOX_HP_READY: {
...@@ -571,6 +554,18 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -571,6 +554,18 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->RefreshBot(); mainGame->RefreshBot();
break; break;
} }
case COMBOBOX_HP_CATEGORY: {
int catesel = mainGame->cbCategorySelect->getSelected();
if(catesel == 3) {
catesel = 2;
mainGame->cbCategorySelect->setSelected(2);
}
if(catesel >= 0) {
mainGame->RefreshDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
mainGame->cbDeckSelect->setSelected(0);
}
break;
}
} }
break; break;
} }
......
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