J :

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

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;