Fixes for exclusion/inclusion combinations of colors or abilities.

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);