J :

* New interface.
* This breaks a lot of things. It is not feature-equivalent. It
  probably doesn't compile under windows and doesn't work on PSP.
* Damage is not resolved any more. This will have to be fixed.
* Blockers can't be ordered any more. This will have to be fixed.
* A lot of new art is included.

projects/mtg/include/DuelLayers.h

@@ -1,32 +1,51 @@
 #ifndef _DUELLAYERS_H_
 #define _DUELLAYERS_H_
 
-
 #include "GuiLayers.h"
+#include "CardSelector.h"
 
 class MTGGuiHand;
 class MTGGuiPlay;
 class ActionLayer;
 class ActionStack;
 class DamageResolverLayer;
+class GuiHandSelf;
+class GuiHandOpponent;
+class GuiCombat;
+class Pos;
 
-class DuelLayers: public GuiLayers{
+class DuelLayers {
+ protected:
+  int nbitems;
+  vector<GuiLayer*> objects;
+  vector<Pos*> waiters;
+  GuiCombat* combat;
+  ActionLayer* action;
+  ActionStack* stack;
+  GuiHandSelf *hand;
+
+public:
+  DuelLayers();
+  ~DuelLayers();
 
-public : 
   ActionLayer * actionLayer();
-  MTGGuiHand * handLayer();
-  MTGGuiPlay * playLayer();
   ActionStack * stackLayer();
-  DamageResolverLayer * combatLayer();
   void init();
+  virtual void Update(float dt, Player * player);
 
+  void Render();
+  void Add(GuiLayer * layer);
+  void Remove();
+  int unstoppableRenderInProgress();
+  int receiveEvent(WEvent * e);
+  float RightBoundary();
+
+  CardSelector* cs;
 };
 
 #include "ActionLayer.h"
 #include "GameObserver.h"
 #include "MTGGamePhase.h"
-#include "MTGGuiHand.h"
-#include "MTGGuiPlay.h"
 #include "ActionStack.h"
 #include "Damage.h"