Erwan

- Magic 2010 - blockers ordering
- Fixed a memory leak introduced in a previous revision (foreach)

projects/mtg/include/DamageResolverLayer.h

@@ -10,8 +10,11 @@ class DamageStack;
 class DamageResolverLayer:public PlayGuiObjectController{
  protected:
   int trampleDamage();
+  void updateAllCoordinates();
  public:
   int buttonOk;
+  int orderingIsNeeded;
+
   int currentPhase;
   int remainingDamageSteps;
   Player *  currentChoosingPlayer;
@@ -23,16 +26,26 @@ class DamageResolverLayer:public PlayGuiObjectController{
   int initResolve();
   Player * whoSelectsDamagesDealtBy(MTGCardInstance * card);
   int addAutoDamageToOpponents(MTGCardInstance * card);
-  int addIfNotExists(MTGCardInstance * card, Player * selecter);
+  DamagerDamaged * addIfNotExists(MTGCardInstance * card, Player * selecter);
   int addDamager(MTGCardInstance * card, Player * selecter);
+  int updateCoordinates(MTGCardInstance * card);
   DamagerDamaged * findByCard(MTGCardInstance * card);
   int canStopDealDamages();
   int resolveDamages();
   int isOpponent(DamagerDamaged * a, DamagerDamaged * b);
-  void nextPlayer();
+  int nextPlayer();
   virtual void Update(float dt);
   virtual bool CheckUserInput(u32 key);
   virtual void Render();
+  int isDisplayed(){return mCount;};
+  int autoOrderBlockers();
+  bool blockersOrderingDone();
+
+  bool clickDamage(DamagerDamaged * current);
+  bool clickDamage(MTGCardInstance * c);
+  bool clickReorderBlocker(MTGCardInstance * blocker);
+
+  bool checkUserInputOrderBlockers(u32 key);
 };
 
 #endif