Erwan

- fix issue 22 (Graveyard display messed up)
- fix issue 38 (graveyard and library unusable)
- fix issue 59 (can't cancel a spell with a target)

projects/mtg/include/CardDisplay.h

@@ -12,6 +12,7 @@ class CardDisplay:public PlayGuiObjectController{
   GameObserver* game;
  public:
   int x, y , start_item, nb_displayed_items;
+  MTGGameZone * zone;
   TargetChooser * tc;
   JGuiListener * listener;
   CardDisplay();
@@ -20,6 +21,7 @@ class CardDisplay:public PlayGuiObjectController{
   void rotateLeft();
   void rotateRight();
   bool CheckUserInput(u32 key);
+  virtual void Update(float dt);
   void Render();
   void init(MTGGameZone * zone);
   virtual ostream& toString(ostream& out) const;

projects/mtg/include/DuelLayers.h

@@ -12,6 +12,7 @@ class DamageResolverLayer;
 class GuiHandSelf;
 class GuiHandOpponent;
 class GuiCombat;
+class GuiAvatars;
 struct Pos;
 
 class DuelLayers {
@@ -23,6 +24,7 @@ class DuelLayers {
   ActionLayer* action;
   ActionStack* stack;
   GuiHandSelf *hand;
+  GuiAvatars * avatars;
 
 public:
   DuelLayers();

projects/mtg/include/GuiAvatars.h

@@ -26,6 +26,7 @@ class GuiAvatars : public GuiLayer
   void Deactivate(PlayGuiObject* c);
   int receiveEventPlus(WEvent*);
   int receiveEventMinus(WEvent*);
+  bool CheckUserInput(u32 key);
 };
 
 #endif // _GUIAVATARS_H_

projects/mtg/include/GuiStatic.h

@@ -42,6 +42,7 @@ struct GuiGameZone : public GuiStatic{
   CardDisplay * cd;
   int showCards;
   virtual void Render();
+  virtual bool CheckUserInput(u32 key);
   virtual void Update(float dt);
   GuiGameZone(float x, float y, bool hasFocus, MTGGameZone * zone, GuiAvatars* parent);
   ~GuiGameZone();

projects/mtg/include/PlayGuiObject.h

@@ -24,8 +24,9 @@ class PlayGuiObject: public JGuiObject, public JGuiListener, public Pos{
   float defaultHeight;
   bool mHasFocus;
   int type;
-  virtual void Entering(){mHasFocus = true;};
-  virtual bool Leaving(u32 key){mHasFocus = false;return true;};
+  virtual void Entering(){mHasFocus = true; zoom = 1.4;};
+  virtual bool Leaving(u32 key){mHasFocus = false; zoom = 1.0; return true;};
+  virtual bool CheckUserInput(u32 key) {return false;};
   virtual bool ButtonPressed(){return true;};
   virtual void Render();
   virtual void Update(float dt);