J :

* Some cleaning after r1062 code review.
- Remove code that was never reached.
- Remove a useless function.
- Make GuiPlay treat cards that are both spells and creatures as
  creatures and not spells.

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*);
   };

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;
   }
 

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,