J :

* Remove carriage returns & whitespace, and re-indent.

projects/mtg/src/MTGAbility.cpp

@@ -1281,7 +1281,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
       break;
     }
 
-//Addons The Dark
+    //Addons The Dark
 
   case 1797: //Inferno does 6 damage to all players and all creatures.
     {
@@ -1304,7 +1304,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
     }
 
 
-//Addons Legends
+    //Addons Legends
   case 1427: //Abomination
     {
       game->addObserver(NEW AAbomination(_id,card));
@@ -1326,7 +1326,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
       game->addObserver(NEW AGiveLifeForTappedType (_id, card, "island"));
       break;
     }
-//Addons ICE-AGE Cards
+    //Addons ICE-AGE Cards
 
   case 2650: //Pyroclasm Need to be improved copied from hurricane with does 0 dammage to player and does 2 dammage to each creature
     {
@@ -1614,44 +1614,44 @@ void TriggeredAbility::Update(float dt){
 
 
 
-	//
+//
-	InstantAbility::InstantAbility(int _id, MTGCardInstance * source):MTGAbility(_id, source){
+InstantAbility::InstantAbility(int _id, MTGCardInstance * source):MTGAbility(_id, source){
   init = 0;
   for (int i = 0; i < 2; i++){
     if(game->players[i]->game->inPlay->hasCard(source)){
       game->players[i]->game->putInGraveyard(source);
     }
   }
-	}
+}
 
-	void InstantAbility::Update(float dt){
+void InstantAbility::Update(float dt){
   if (!init){
     init = resolve();
   }
-	}
+}
 
-	InstantAbility::InstantAbility(int _id, MTGCardInstance * source, Damageable * _target):MTGAbility(_id, source, _target){
+InstantAbility::InstantAbility(int _id, MTGCardInstance * source, Damageable * _target):MTGAbility(_id, source, _target){
   init = 0;
   for (int i = 0; i < 2; i++){
     if(game->players[i]->game->inPlay->hasCard(source)){
       game->players[i]->game->putInGraveyard(source);
     }
   }
-	}
+}
 
 
 
-	//Instant abilities last generally until the end of the turn
+//Instant abilities last generally until the end of the turn
-	int InstantAbility::testDestroy(){
+int InstantAbility::testDestroy(){
   int newPhase = game->getCurrentGamePhase();
   if (newPhase != currentPhase && newPhase == MTG_PHASE_UNTAP) return 1;
   currentPhase = newPhase;
   return 0;
 
-	}
+}
 
 
-	void ListMaintainerAbility::Update(float dt){
+void ListMaintainerAbility::Update(float dt){
   map<MTGCardInstance *,bool>::iterator it=cards.begin();
   while(it != cards.end()){
     MTGCardInstance * card = (*it).first;
@@ -1688,10 +1688,10 @@ void TriggeredAbility::Update(float dt){
       }
     }
   }
-	}
+}
 
-	//Destroy the spell -> remove all targets
+//Destroy the spell -> remove all targets
-	int ListMaintainerAbility::destroy(){
+int ListMaintainerAbility::destroy(){
   map<MTGCardInstance *,bool>::iterator it;
 
   for ( it=cards.begin() ; it != cards.end(); it++ ){
@@ -1699,32 +1699,32 @@ void TriggeredAbility::Update(float dt){
   }
   cards.clear();
   return 1;
-	}
+}
 
 
-	/* An attempt to globalize triggered abilities as much as possible */
+/* An attempt to globalize triggered abilities as much as possible */
 
-	MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(){
+MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(){
   game = GameObserver::GetInstance();
-	}
+}
-	MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(MTGCardInstance * _source, Damageable * _target):source(_source),target(_target){
+MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(MTGCardInstance * _source, Damageable * _target):source(_source),target(_target){
   if (!target) target = source;
   game = GameObserver::GetInstance();
-	}
+}
-	void MTGAbilityBasicFeatures::init(MTGCardInstance * _source, Damageable * _target){
+void MTGAbilityBasicFeatures::init(MTGCardInstance * _source, Damageable * _target){
   source = source;
   target=_target;
   if (!target) target = source;
-	}
+}
 
 
 
-	TriggerAtPhase::TriggerAtPhase(int _phaseId):Trigger(),phaseId(_phaseId){
+TriggerAtPhase::TriggerAtPhase(int _phaseId):Trigger(),phaseId(_phaseId){
   currentPhase = game->getCurrentGamePhase();
   newPhase = game->getCurrentGamePhase();
-	}
+}
 
-	int TriggerAtPhase::trigger(){
+int TriggerAtPhase::trigger(){
   int result = 0;
   newPhase = game->getCurrentGamePhase();
   if (currentPhase != newPhase && newPhase == phaseId){
@@ -1732,38 +1732,38 @@ void TriggeredAbility::Update(float dt){
   }
   currentPhase = newPhase;
   return result;
-	}
+}
 
-	TriggerNextPhase::TriggerNextPhase(int _phaseId):TriggerAtPhase(_phaseId){
+TriggerNextPhase::TriggerNextPhase(int _phaseId):TriggerAtPhase(_phaseId){
   destroyActivated = 0;
-	}
+}
 
-	int TriggerNextPhase::testDestroy(){
+int TriggerNextPhase::testDestroy(){
   if (newPhase <= phaseId) destroyActivated = 1;
   if ( newPhase > phaseId && destroyActivated){
     return 1;
   }
   return 0;
-	}
+}
 
 
 
 
-	DrawEvent::DrawEvent(Player * _player, int _nbcards):TriggeredEvent(),player(_player),nbcards(_nbcards){
+DrawEvent::DrawEvent(Player * _player, int _nbcards):TriggeredEvent(),player(_player),nbcards(_nbcards){
-	}
+}
 
-	int DrawEvent::resolve(){
+int DrawEvent::resolve(){
   game->mLayers->stackLayer()->addDraw(player,nbcards);
   return nbcards;
-	}
+}
 
-  int BuryEvent::resolve(){
+int BuryEvent::resolve(){
   MTGCardInstance * _target = (MTGCardInstance *) target;
   _target->controller()->game->putInGraveyard(_target);
   return 1;
-  }
+}
 
- int DestroyCondition::testDestroy(){
+int DestroyCondition::testDestroy(){
   if (!game->isInPlay(source)){
     return 1;
   }
@@ -1772,11 +1772,11 @@ void TriggeredAbility::Update(float dt){
     return 1;
   }
   return 0;
-	}
+}
 
 
 
-	GenericTriggeredAbility::GenericTriggeredAbility(int id, MTGCardInstance * _source, Trigger * _t, TriggeredEvent * _te, DestroyCondition * _dc , Damageable * _target ): TriggeredAbility(id, _source,_target){
+GenericTriggeredAbility::GenericTriggeredAbility(int id, MTGCardInstance * _source, Trigger * _t, TriggeredEvent * _te, DestroyCondition * _dc , Damageable * _target ): TriggeredAbility(id, _source,_target){
   if (!target) target = source;
   t = _t;
   te = _te;
@@ -1785,23 +1785,23 @@ void TriggeredAbility::Update(float dt){
   t->init(source,target);
   te->init(source,target);
   if (dc) dc->init(source,target);
-	}
+}
 
-	int GenericTriggeredAbility::trigger(){
+int GenericTriggeredAbility::trigger(){
   return t->trigger();
-	}
+}
 
-	int GenericTriggeredAbility::resolve(){
+int GenericTriggeredAbility::resolve(){
   return te->resolve();
-	}
+}
 
-  int GenericTriggeredAbility::testDestroy(){
+int GenericTriggeredAbility::testDestroy(){
   if (dc) return dc->testDestroy();
   return t->testDestroy();
-	}
+}
 
-	GenericTriggeredAbility::~GenericTriggeredAbility(){
+GenericTriggeredAbility::~GenericTriggeredAbility(){
   delete t;
   delete te;
   SAFE_DELETE(dc);
-	}
+}