Erwan

- the testsuite now outputs an HTML result file with colors
- hopefully speed improvements for the game on PSP (needs testing on the actual device)

projects/mtg/include/MTGGameZones.h

@@ -1,6 +1,9 @@
 #ifndef _MTGGAMEZONES_H_
 #define _MTGGAMEZONES_H_
 
+#include <map>
+using std::map;
+
 #include "MTGDeck.h"
 #include "MTGCardInstance.h"
 
@@ -14,7 +17,9 @@ class MTGGameZone {
  protected:
 	 Player * owner;
  public:
+		//Both cards and cardsMap contain the cards of a zone. The long term objective is to get rid of the array
   MTGCardInstance * cards[MTG_MAX_PLAYER_CARDS];
+	map<MTGCardInstance *,int> cardsMap;
   int nb_cards;
   MTGGameZone();
 	~MTGGameZone();

projects/mtg/include/Subtypes.h

@@ -1,20 +1,20 @@
 #ifndef _SUBTYPES_H_
 #define _SUBTYPES_H_
 
-#define MAX_SUBTYPES 1000
 
 #include <string>
+#include <map>
 using std::string;
+using std::map;
 
 class Subtypes{
 protected:
-		int nb_items;
-		string values[MAX_SUBTYPES];
+	  int nb_items;
+		map<string,int> values;
 
 public:
 	static Subtypes * subtypesList;
 	Subtypes();
-	int offset;
 	int Add(const char * subtype);
 	int find(const char * subtype);
 	int Add(string subtype);