ok this is the last commit but i had massive issues after chopping it all up, hopefully it doesn't hilight everything that was already commited...if it does i apologize my own patch started giving me conflicts....

im like 7 tries into commiting this part....
2012-03-13 17:54:24 +00:00
parent b20b75df33
commit 0210ecf28c
15 changed files with 1269 additions and 126 deletions
@@ -165,7 +165,11 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
                        }
                    case 'c': //Counters or cycle
                        {
-                            if(value == "cycle")
+                            if(value == "chosencolor")
+                            {
+                                manaCost->add(c->chooseacolor, 1);
+                            }
+                            else if(value == "cycle")
                            {
                                manaCost->addExtraCost(NEW CycleCost(tc));
                            }
@@ -631,6 +635,11 @@ int ManaCost::addExtraCost(ExtraCost * _cost)

 int ManaCost::addExtraCosts(ExtraCosts *_ecost)
 {
+    if(!_ecost)
+    {
+        extraCosts = NULL;
+        return 1;
+    }
    if (!extraCosts)
        extraCosts = NEW ExtraCosts();
    for(size_t i = 0; i < _ecost->costs.size(); i++)