J :

* Some more tweaking for combat.
* This still doesn't work, but it's closer.

projects/mtg/include/Damage.h

@@ -40,7 +40,7 @@ class Damage: public Interruptible {
 };
 
 
-class DamageStack :public GuiLayer, public Interruptible{
+class DamageStack : public GuiLayer, public Interruptible{
  protected:
   int currentState;
   GameObserver* game;
@@ -49,20 +49,7 @@ class DamageStack :public GuiLayer, public Interruptible{
   int resolve();
   void Render();
   virtual ostream& toString(ostream& out) const;
-  DamageStack(GameObserver* game);
+  DamageStack();
 };
 
-class StableDamageStack : public Interruptible {
- protected:
-  vector<Damage*> damage;
-
- public:
-  int resolve();
-  void Render();
-  void Add(Damage*);
-  virtual ostream& toString(ostream& out) const;
-};
-
-
-
 #endif

projects/mtg/include/GameObserver.h

@@ -31,11 +31,9 @@ class GameObserver{
   int nbPlayers;
   int currentPlayerId;
   int currentRound;
-  int blockersAssigned;
-
 
  public:
-  int blockersSorted;
+  CombatStep combatStep;
   int turn;
   int forceShuffleLibraries();
   int targetListIsSet(MTGCardInstance * card);
@@ -57,6 +55,7 @@ class GameObserver{
   void cardClick(MTGCardInstance * card,Targetable * _object = NULL );
   int enteringPhase(int phase);
   int getCurrentGamePhase();
+  void nextCombatStep();
   void userRequestNextGamePhase();
   void nextGamePhase();
   void cleanupPhase();

projects/mtg/include/GuiStatic.h

@@ -7,7 +7,7 @@
 #include "CardGui.h"
 #include "GuiAvatars.h"
 
-class TransientCardView;
+class CardView;
 
 struct GuiStatic : public PlayGuiObject{
   GuiAvatars* parent;
@@ -35,7 +35,7 @@ struct GuiAvatar : public GuiStatic{
 struct GuiGameZone : public GuiStatic{
   static const int Width = 20;
   static const int Height = 25;
-  vector<TransientCardView*> cards;
+  vector<CardView*> cards;
 
  public:
   MTGGameZone * zone;

projects/mtg/include/PhaseRing.h

@@ -10,7 +10,7 @@ using std::list;
 
 class Player;
 
-typedef enum { ORDER, FIRST_STRIKE, DAMAGE } CombatStep;
+typedef enum { BLOCKERS, ORDER, FIRST_STRIKE, DAMAGE } CombatStep;
 class Phase{
  public:
   int id;