Erwan

-code cleanup
-fix one card in TSP

projects/mtg/include/ActionStack.h

@@ -171,8 +171,6 @@ class ActionStack :public GuiLayer{
   virtual void Render();
   ActionStack(GameObserver* game);
   int resolve();
-  int CombatDamages();
-  int CombatDamages(int firststrike);
   int has(Interruptible * action);
   int has(MTGAbility * ability);
 #if defined (WIN32) || defined (LINUX)

projects/mtg/include/Damage.h

@@ -48,8 +48,6 @@ class DamageStack :public GuiLayer, public Interruptible{
  public:
   int resolve();
   void Render();
-  int CombatDamages();//Deprecated ?
-  int CombatDamages(int strike);
   virtual ostream& toString(ostream& out) const;
   DamageStack(GameObserver* game);
 };

projects/mtg/include/DamageResolverLayer.h

@@ -1,53 +0,0 @@
-#ifndef _DAMAGERESOLVERLAYER_H_
-#define _DAMAGERESOLVERLAYER_H_
-#include "../include/PlayGuiObjectController.h"
-
-class MTGCardInstance;
-struct DamagerDamaged;
-class DamageStack;
-
-
-class DamageResolverLayer:public PlayGuiObjectController{
- protected:
-  GameObserver* game;
-  int trampleDamage();
-  void updateAllCoordinates();
-
- public:
-  int buttonOk;
-  int orderingIsNeeded;
-
-  int currentPhase;
-  int remainingDamageSteps;
-  Player *  currentChoosingPlayer;
-  DamageStack * damageStack;
-  DamagerDamaged * currentSource;
-
-  DamageResolverLayer(GameObserver* game);
-  int init();
-  int initResolve();
-  Player * whoSelectsDamagesDealtBy(MTGCardInstance * card);
-  int addAutoDamageToOpponents(MTGCardInstance * card);
-  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);
-  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

projects/mtg/include/MTGAbility.h

@@ -148,6 +148,7 @@ class ListMaintainerAbility:public MTGAbility{
  ListMaintainerAbility(int _id, MTGCardInstance *_source,Damageable * _target):MTGAbility(_id, _source, _target){};
   virtual void Update(float dt);
   void updateTargets();
+  virtual bool canTarget(MTGGameZone * zone);
   virtual int canBeInList(MTGCardInstance * card) = 0;
   virtual int added(MTGCardInstance * card) = 0;
   virtual int removed(MTGCardInstance * card) = 0;
@@ -202,8 +203,8 @@ class AbilityFactory{
   int parsePowerToughness(string s, int *power, int *toughness);
   TriggeredAbility * parseTrigger(string s, int id, Spell * spell, MTGCardInstance *card, Targetable * target);
   MTGAbility * parseMagicLine(string s, int id, Spell * spell, MTGCardInstance *card, int activated = 0);
-  int abilityEfficiency(MTGAbility * a, Player * p, int mode = MODE_ABILITY);
  public:
+  int abilityEfficiency(MTGAbility * a, Player * p, int mode = MODE_ABILITY);
   int magicText(int id, Spell * spell, MTGCardInstance * card = NULL);
   static int computeX(Spell * spell, MTGCardInstance * card);
   int destroyAllInPlay(TargetChooser * tc, int bury = 0);