diff --git a/projects/mtg/include/GuiPlay.h b/projects/mtg/include/GuiPlay.h index b0eaca41d..fa64eaba7 100644 --- a/projects/mtg/include/GuiPlay.h +++ b/projects/mtg/include/GuiPlay.h @@ -27,7 +27,6 @@ class GuiPlay : public GuiLayer class HorzStack : public CardStack { public: HorzStack(); - void reset(unsigned total, float x, float y); void Render(CardView*, iterator begin, iterator end); void Enstack(CardView*); }; diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index 4bed81b59..37dd68a75 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -182,10 +182,9 @@ void GuiHandSelf::Render() JRenderer::GetInstance()->RenderQuad(back,backpos.actX, backpos.actY, backpos.actT, backpos.actZ, backpos.actZ); back->SetColor(ARGB(255,255,255,255)); mFont->DrawString("0",SCREEN_WIDTH - 10,backpos.actY); - }else{ - backpos.Render(back); - if (OptionHandDirection::HORIZONTAL == options[Options::HANDDIRECTION].number) mFont->DrawString("Empty",backpos.actX,backpos.actY); } + else + backpos.Render(back); return; } diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index d0901f4e1..ce9b3a982 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -33,11 +33,6 @@ void GuiPlay::CardStack::RenderSpell(MTGCardInstance* card, iterator begin, iter GuiPlay::HorzStack::HorzStack() {} GuiPlay::VertStack::VertStack() {} -void GuiPlay::HorzStack::reset(unsigned total, float x, float y) -{ - GuiPlay::CardStack::reset(total, x, y); -} - void GuiPlay::VertStack::reset(unsigned total, float x, float y) { GuiPlay::CardStack::reset(total, x - CARD_WIDTH, y); @@ -124,7 +119,7 @@ GuiPlay::~GuiPlay() } } -bool isSpell(CardView* c) { return c->card->isSpell(); } +bool isSpell(CardView* c) { return c->card->isSpell() && !c->card->isCreature(); } void GuiPlay::Replace() { unsigned opponentSpellsN = 0, selfSpellsN = 0, opponentLandsN = 0, opponentCreaturesN = 0,