Fixes for exclusion/inclusion combinations of colors or abilities.

projects/mtg/include/CardDescriptor.h

@@ -11,7 +11,6 @@
 
 #define CD_OR 1
 #define CD_AND 2
-#define CD_NOT 3
 
 enum ENUM_COMPARISON_MODES
   {
@@ -59,6 +58,11 @@ class CardDescriptor: public MTGCardInstance
   MTGCardInstance * match(MTGGameZone * zone);
   MTGCardInstance * nextmatch(MTGGameZone * zone, MTGCardInstance * previous);
   
+  void SetExclusionColor(int _color, int removeAllOthers = 0);
+
+  uint8_t mColorExclusions;
+  BasicAbilitiesSet mAbilityExclusions;
+
   int nameComparisonMode;
   int colorComparisonMode;
   string compareName;

projects/mtg/include/CardPrimitive.h

@@ -36,7 +36,8 @@ public:
     int init();
 
     uint8_t colors;
-    std::bitset<Constants::NB_BASIC_ABILITIES> basicAbilities;
+    typedef std::bitset<Constants::NB_BASIC_ABILITIES> BasicAbilitiesSet;
+    BasicAbilitiesSet basicAbilities;
 
     map<string,string> magicTexts;
     string magicText;
@@ -61,6 +62,8 @@ public:
     bool hasColor(int inColor);
     int countColors();
 
+    static uint8_t ConvertColorToBitMask(int inColor);
+
     int has(int ability);
 
     void setText(const string& value);