Commit 4aae756e authored by edo9300's avatar edo9300

Merge lefrovers

parent c2462410
......@@ -100,13 +100,7 @@ void DeckBuilder::Terminate() {
mainGame->device->setEventReceiver(&mainGame->menuHandler);
mainGame->wACMessage->setVisible(false);
mainGame->ClearTextures();
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);
mainGame->ClearCardInfo(0);
mainGame->scrFilter->setVisible(false);
int sel = mainGame->cbDBDecks->getSelected();
if(sel >= 0)
......
......@@ -993,7 +993,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stCardListTip->setVisible(false);
}
if(id == TEXT_CARD_LIST_TIP) {
mainGame->stCardListTip->setVisible(true);
mainGame->stCardListTip->setVisible(false);
}
break;
}
......@@ -1570,14 +1570,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
} else {
should_show_tip = false;
mainGame->imgCard->setImage(imageManager.tCover[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);
mainGame->ClearCardInfo(0);
}
}
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