J :

* Remove ^M's. * Re-indent automatically. * Remove whitespace at the end of lines.
2008-11-12 13:45:42 +00:00
parent 6ad6f9b668
commit c97dd1f260
116 changed files with 18073 additions and 18073 deletions
--- a/projects/mtg/src/Counters.cpp
+++ b/projects/mtg/src/Counters.cpp
@@ -1,120 +1,120 @@
-#include "../include/Counters.h"
-#include "../include/debug.h"
-#include "../include/MTGCardInstance.h"
-
-Counter::Counter(MTGCardInstance * _target, int _power, int _toughness){
-	init(_target,"",_power, _toughness);
-}
-Counter::Counter(MTGCardInstance * _target, const char * _name,int _power, int _toughness ){
-	init(_target,_name,_power, _toughness);
-}
-
-	int Counter::init(MTGCardInstance * _target,const char * _name, int _power, int _toughness){
-		target = _target;
-		name = _name;
-		power = _power;
-		toughness = _toughness;
-		nb = 1;
-		return 1;
-	}
-
-	bool Counter::sameAs(const char * _name, int _power, int _toughness){
-		if (power == 0 && toughness == 0) return (name.compare(_name) == 0);
-		return (power == _power && toughness == _toughness);
-	}
-
-	bool Counter::cancels(int _power, int _toughness){
-		if (power == 0 && toughness == 0) return false;
-		return (power == -_power && toughness == -_toughness);
-	}
-
-	int Counter::added(){
-		if (power != 0 || toughness != 0){
-			target->power+= power;
-			target->addToToughness(toughness);
-		}
-		return 1;
-	}
-
-	int Counter::removed(){
-		if (power != 0 || toughness != 0){
-			target->power-= power;
-			target->addToToughness(-toughness);
-		}
-		return 1;
-	}
-
-
-	Counters::Counters(MTGCardInstance * _target):target(_target){
-		mCount = 0;
-	}
-	Counters::~Counters(){
-		for (int i = 0; i < mCount; i++){
-			delete counters[i];
-		}
-	}
-
-	int Counters::addCounter(const char * _name,int _power, int _toughness){
-		for (int i = 0; i < mCount; i++){
-			if (counters[i]->cancels( _power,_toughness) && counters[i]->nb > 0){
-				counters[i]->removed();
-				counters[i]->nb--;
-				return mCount;
-			}
-		}
-
-		for (int i = 0; i < mCount; i++){
-			if (counters[i]->sameAs(_name, _power,_toughness)){
-				counters[i]->added();
-				counters[i]->nb++;
-				return mCount;
-			}
-		}
-		Counter * counter = NEW Counter(target,_name, _power, _toughness);
-		counters[mCount] = counter;
-		counter->added();
-		mCount++;
-		return mCount;
-	}
-
-	int Counters::addCounter(int _power, int _toughness){
-		return addCounter("",_power, _toughness);
-	}
-
-	int Counters::removeCounter(const char * _name,int _power, int _toughness){
-		for (int i = 0; i < mCount; i++){
-			if (counters[i]->sameAs(_name, _power,_toughness)){
-				if (counters[i]->nb < 1) return 0;
-				counters[i]->removed();
-				counters[i]->nb--;
-				return mCount;
-			}
-		}
-		return 0;
-	}
-
-	int Counters::removeCounter(int _power, int _toughness){
-		return removeCounter("",_power, _toughness);
-	}
-
-	Counter * Counters::hasCounter(const char * _name,int _power, int _toughness){
-		for (int i = 0; i < mCount; i++){
-			if (counters[i]->sameAs(_name, _power,_toughness)){
-				if (counters[i]->nb > 0) return counters[i];
-			}
-		}	
-		return NULL;
-	}
-
-	Counter * Counters::hasCounter(int _power , int _toughness ){
-		return hasCounter("",_power, _toughness);
-	}
-
-	Counter * Counters::getNext(Counter * previous){
-		int found = 0;
-		for (int i = 0; i < mCount ; i++){
-			if (found && counters[i]->nb > 0) return counters[i];
-			if (counters[i] == previous) found = 1;
-		}
-		return NULL;
-	}
+#include "../include/Counters.h"
+#include "../include/debug.h"
+#include "../include/MTGCardInstance.h"
+
+Counter::Counter(MTGCardInstance * _target, int _power, int _toughness){
+  init(_target,"",_power, _toughness);
+}
+Counter::Counter(MTGCardInstance * _target, const char * _name,int _power, int _toughness ){
+  init(_target,_name,_power, _toughness);
+}
+
+int Counter::init(MTGCardInstance * _target,const char * _name, int _power, int _toughness){
+  target = _target;
+  name = _name;
+  power = _power;
+  toughness = _toughness;
+  nb = 1;
+  return 1;
+}
+
+bool Counter::sameAs(const char * _name, int _power, int _toughness){
+  if (power == 0 && toughness == 0) return (name.compare(_name) == 0);
+  return (power == _power && toughness == _toughness);
+}
+
+bool Counter::cancels(int _power, int _toughness){
+  if (power == 0 && toughness == 0) return false;
+  return (power == -_power && toughness == -_toughness);
+}
+
+int Counter::added(){
+  if (power != 0 || toughness != 0){
+    target->power+= power;
+    target->addToToughness(toughness);
+  }
+  return 1;
+}
+
+int Counter::removed(){
+  if (power != 0 || toughness != 0){
+    target->power-= power;
+    target->addToToughness(-toughness);
+  }
+  return 1;
+}
+
+
+Counters::Counters(MTGCardInstance * _target):target(_target){
+  mCount = 0;
+}
+Counters::~Counters(){
+  for (int i = 0; i < mCount; i++){
+    delete counters[i];
+  }
+}
+
+int Counters::addCounter(const char * _name,int _power, int _toughness){
+  for (int i = 0; i < mCount; i++){
+    if (counters[i]->cancels( _power,_toughness) && counters[i]->nb > 0){
+      counters[i]->removed();
+      counters[i]->nb--;
+      return mCount;
+    }
+  }
+
+  for (int i = 0; i < mCount; i++){
+    if (counters[i]->sameAs(_name, _power,_toughness)){
+      counters[i]->added();
+      counters[i]->nb++;
+      return mCount;
+    }
+  }
+  Counter * counter = NEW Counter(target,_name, _power, _toughness);
+  counters[mCount] = counter;
+  counter->added();
+  mCount++;
+  return mCount;
+}
+
+int Counters::addCounter(int _power, int _toughness){
+  return addCounter("",_power, _toughness);
+}
+
+int Counters::removeCounter(const char * _name,int _power, int _toughness){
+  for (int i = 0; i < mCount; i++){
+    if (counters[i]->sameAs(_name, _power,_toughness)){
+      if (counters[i]->nb < 1) return 0;
+      counters[i]->removed();
+      counters[i]->nb--;
+      return mCount;
+    }
+  }
+  return 0;
+}
+
+int Counters::removeCounter(int _power, int _toughness){
+  return removeCounter("",_power, _toughness);
+}
+
+Counter * Counters::hasCounter(const char * _name,int _power, int _toughness){
+  for (int i = 0; i < mCount; i++){
+    if (counters[i]->sameAs(_name, _power,_toughness)){
+      if (counters[i]->nb > 0) return counters[i];
+    }
+  }
+  return NULL;
+}
+
+Counter * Counters::hasCounter(int _power , int _toughness ){
+  return hasCounter("",_power, _toughness);
+}
+
+Counter * Counters::getNext(Counter * previous){
+  int found = 0;
+  for (int i = 0; i < mCount ; i++){
+    if (found && counters[i]->nb > 0) return counters[i];
+    if (counters[i] == previous) found = 1;
+  }
+  return NULL;
+}