J :

* Remove useless whitespace & carriage returns, reindent.

projects/mtg/include/MTGAbility.h

@@ -21,7 +21,7 @@ using std::map;
 
 
 //Two stupid variables used to give a hint to the AI:
-// Should I cast a spell on an ennemy or friendly unit ?
+// Should I cast a spell on an enemy or friendly unit ?
 #define BAKA_EFFECT_GOOD 10
 #define BAKA_EFFECT_BAD 11
 
@@ -29,7 +29,7 @@ using std::map;
 
 class MTGAbility: public ActionElement{
  protected:
-	char menuText[25];
+  char menuText[25];
   Damageable * target;
   GameObserver * game;
  public:
@@ -39,72 +39,72 @@ class MTGAbility: public ActionElement{
   virtual int testDestroy();
   virtual ~MTGAbility();
   virtual void Render(){};
-	virtual int isReactingToClick(MTGCardInstance * card){return 0;};
+  virtual int isReactingToClick(MTGCardInstance * card){return 0;};
-	virtual int reactToClick(MTGCardInstance * card){return 0;};
+  virtual int reactToClick(MTGCardInstance * card){return 0;};
   virtual void Update(float dt){};
-	virtual int fireAbility();
+  virtual int fireAbility();
-	virtual int resolve(){return 0;};
+  virtual int resolve(){return 0;};
 
 
 };
 
 
 class TriggeredAbility:public MTGAbility{
-	public:
+ public:
-	TriggeredAbility(int id, MTGCardInstance * card);
+  TriggeredAbility(int id, MTGCardInstance * card);
-	TriggeredAbility(int id, MTGCardInstance * _source, Damageable * _target);
+  TriggeredAbility(int id, MTGCardInstance * _source, Damageable * _target);
-	virtual void Update(float dt);
+  virtual void Update(float dt);
-	virtual void Render(){};
+  virtual void Render(){};
-	virtual int trigger()=0;
+  virtual int trigger()=0;
-	virtual int resolve() = 0;
+  virtual int resolve() = 0;
 };
 
 
 class ActivatedAbility:public MTGAbility{
-public:
+ public:
-	ManaCost * cost;
+  ManaCost * cost;
-	int playerturnonly;
+  int playerturnonly;
-	int needsTapping;
+  int needsTapping;
-	ActivatedAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
+  ActivatedAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
-	virtual int reactToClick(MTGCardInstance * card);
+  virtual int reactToClick(MTGCardInstance * card);
-	virtual int isReactingToClick(MTGCardInstance * card);
+  virtual int isReactingToClick(MTGCardInstance * card);
-	virtual int reactToTargetClick(Targetable * object);
+  virtual int reactToTargetClick(Targetable * object);
-	virtual int resolve() = 0;
+  virtual int resolve() = 0;
-	virtual ~ActivatedAbility();
+  virtual ~ActivatedAbility();
 };
 
 class TargetAbility:public ActivatedAbility{
-public:
+ public:
-	TargetAbility(int id, MTGCardInstance * card, TargetChooser * _tc,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
+  TargetAbility(int id, MTGCardInstance * card, TargetChooser * _tc,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
-	TargetAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
+  TargetAbility(int id, MTGCardInstance * card,ManaCost * _cost = NULL, int _playerturnonly = 0,int tap = 1);
-	virtual void Update(float dt);
+  virtual void Update(float dt);
-	virtual int reactToClick(MTGCardInstance * card);
+  virtual int reactToClick(MTGCardInstance * card);
-	virtual int reactToTargetClick(Targetable * object);
+  virtual int reactToTargetClick(Targetable * object);
-	virtual void Render();
+  virtual void Render();
 };
 
 class InstantAbility:public MTGAbility{
-public:
+ public:
-	int init;
+  int init;
-	virtual void Update(float dt);
+  virtual void Update(float dt);
-	virtual int testDestroy();
+  virtual int testDestroy();
-	InstantAbility(int _id, MTGCardInstance * source);
+  InstantAbility(int _id, MTGCardInstance * source);
-	InstantAbility(int _id, MTGCardInstance * source,Damageable * _target);
+  InstantAbility(int _id, MTGCardInstance * source,Damageable * _target);
-	virtual int resolve(){return 0;};
+  virtual int resolve(){return 0;};
 };
 
 /* State based effects. This class works ONLY for InPlay and needs to be extended for other areas of the game !!! */
 class ListMaintainerAbility:public MTGAbility{
-public:
+ public:
-	map<MTGCardInstance *,bool> cards;
+  map<MTGCardInstance *,bool> cards;
-	ListMaintainerAbility(int _id):MTGAbility(_id,NULL){};
+ ListMaintainerAbility(int _id):MTGAbility(_id,NULL){};
-	ListMaintainerAbility(int _id, MTGCardInstance *_source):MTGAbility(_id, _source){};
+ ListMaintainerAbility(int _id, MTGCardInstance *_source):MTGAbility(_id, _source){};
-	ListMaintainerAbility(int _id, MTGCardInstance *_source,Damageable * _target):MTGAbility(_id, _source, _target){};
+ ListMaintainerAbility(int _id, MTGCardInstance *_source,Damageable * _target):MTGAbility(_id, _source, _target){};
-	virtual void Update(float dt);
+  virtual void Update(float dt);
-	virtual int canBeInList(MTGCardInstance * card) = 0;
+  virtual int canBeInList(MTGCardInstance * card) = 0;
-	virtual int added(MTGCardInstance * card) = 0;
+  virtual int added(MTGCardInstance * card) = 0;
-	virtual int removed(MTGCardInstance * card) = 0;
+  virtual int removed(MTGCardInstance * card) = 0;
-	virtual int destroy();
+  virtual int destroy();
 };
 
 /* An attempt to globalize triggered abilities as much as possible */
@@ -113,81 +113,81 @@ class MTGAbilityBasicFeatures{
   Damageable * target;
   GameObserver * game;
   MTGCardInstance * source;
-	MTGAbilityBasicFeatures();
+  MTGAbilityBasicFeatures();
   MTGAbilityBasicFeatures(MTGCardInstance * _source, Damageable * _target = NULL);
-	void init(MTGCardInstance * _source, Damageable * _target = NULL);
+  void init(MTGCardInstance * _source, Damageable * _target = NULL);
 };
 
 class Trigger:public MTGAbilityBasicFeatures{
-public: 
+ public:
-	virtual int trigger()=0;
+  virtual int trigger()=0;
-	virtual int testDestroy(){return 0;};
+  virtual int testDestroy(){return 0;};
 };
 
 
 class TriggerAtPhase:public Trigger{
-public:
+ public:
-	int currentPhase, newPhase;
+  int currentPhase, newPhase;
-	int phaseId;
+  int phaseId;
 
-	TriggerAtPhase(int _phaseId);
+  TriggerAtPhase(int _phaseId);
 
-	virtual int trigger();
+  virtual int trigger();
 };
 
 class TriggerNextPhase:public TriggerAtPhase{
-public:
+ public:
-	int destroyActivated;
+  int destroyActivated;
-	TriggerNextPhase(int _phaseId);
+  TriggerNextPhase(int _phaseId);
 
-	virtual int testDestroy();
+  virtual int testDestroy();
 
 };
 
 class TriggeredEvent:public MTGAbilityBasicFeatures{
-public: 
+ public:
-	virtual int resolve()=0;
+  virtual int resolve()=0;
 };
 
 class DrawEvent:public TriggeredEvent{
-public:
+ public:
-	Player * player;
+  Player * player;
-	int nbcards;
+  int nbcards;
-	DrawEvent(Player * _player, int _nbcards);
+  DrawEvent(Player * _player, int _nbcards);
-	int resolve();
+  int resolve();
 };
 
 class BuryEvent: public TriggeredEvent{
-public:
+ public:
   int resolve();
 };
 
 class DestroyCondition:public MTGAbilityBasicFeatures{
-public:
+ public:
-	virtual int testDestroy();
+  virtual int testDestroy();
 };
 
 
 class GenericTriggeredAbility:public TriggeredAbility{
-public:
+ public:
-	Trigger * t;
+  Trigger * t;
-	TriggeredEvent * te;
+  TriggeredEvent * te;
-	DestroyCondition  * dc;
+  DestroyCondition  * dc;
-	GenericTriggeredAbility(int id, MTGCardInstance * _source, Trigger * _t, TriggeredEvent * _te, DestroyCondition * _dc = NULL, Damageable * _target = NULL);
+  GenericTriggeredAbility(int id, MTGCardInstance * _source, Trigger * _t, TriggeredEvent * _te, DestroyCondition * _dc = NULL, Damageable * _target = NULL);
-	virtual int trigger();
+  virtual int trigger();
-	virtual int resolve();
+  virtual int resolve();
-	virtual int testDestroy();
+  virtual int testDestroy();
-	~GenericTriggeredAbility();
+  ~GenericTriggeredAbility();
 };
 
 /* Ability Factory */
 class AbilityFactory{
-private:
+ private:
   int destroyAllInPlay(TargetChooser * tc, int bury = 0);
-	int putInPlayFromZone(MTGCardInstance * card, MTGGameZone * zone, Player * p);
+  int putInPlayFromZone(MTGCardInstance * card, MTGGameZone * zone, Player * p);
-	Trigger * parseTrigger(string magicText);
+  Trigger * parseTrigger(string magicText);
  public:
-	int magicText(int id, Spell * spell, MTGCardInstance * card = NULL);
+  int magicText(int id, Spell * spell, MTGCardInstance * card = NULL);
   void addAbilities(int _id, Spell * spell);
 };