Skip to content

Y
ygopro
Commit 4aae756e authored by edo9300's avatar edo9300
Browse files
Options

Merge lefrovers

parent c2462410
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 16 deletions
gframe/deck_con.cpp
View file @ 4aae756e
...@@ -100,13 +100,7 @@ void DeckBuilder::Terminate() { ...@@ -100,13 +100,7 @@ void DeckBuilder::Terminate() {
mainGame->device->setEventReceiver(&mainGame->menuHandler); mainGame->device->setEventReceiver(&mainGame->menuHandler);
mainGame->wACMessage->setVisible(false); mainGame->wACMessage->setVisible(false);
mainGame->ClearTextures(); mainGame->ClearTextures();
mainGame->stName->setText(L""); mainGame->ClearCardInfo(0);
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false);
mainGame->scrFilter->setVisible(false); mainGame->scrFilter->setVisible(false);
int sel = mainGame->cbDBDecks->getSelected(); int sel = mainGame->cbDBDecks->getSelected();
if(sel >= 0) if(sel >= 0)
......
gframe/event_handler.cpp
View file @ 4aae756e
...@@ -993,7 +993,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -993,7 +993,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stCardListTip->setVisible(false); mainGame->stCardListTip->setVisible(false);
} }
if(id == TEXT_CARD_LIST_TIP) { if(id == TEXT_CARD_LIST_TIP) {
mainGame->stCardListTip->setVisible(true); mainGame->stCardListTip->setVisible(false);
} }
break; break;
} }
...@@ -1570,14 +1570,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1570,14 +1570,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
} }
} else { } else {
should_show_tip = false; should_show_tip = false;
mainGame->imgCard->setImage(imageManager.tCover[0]); mainGame->ClearCardInfo(0);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false);
} }
} }
hovered_card = mcard; hovered_card = mcard;
......
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