From 6a812282755f8a024544c0885af2ff409972cd13 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sun, 17 Oct 2010 13:17:27 +0000 Subject: [PATCH] fixed an issue where color= was not setting multiple colors on a card with this line. Issue: 491 --- projects/mtg/src/MTGDeck.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index 5a4ae5483..f56e907dc 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -88,9 +88,28 @@ int MTGAllCards::processConfLine(string &s, MTGCard *card, CardPrimitive * primi if (!primitive) primitive = NEW CardPrimitive(); { string value = val; - std::transform(value.begin(), value.end(), value.begin(), ::tolower); - primitive->setColor(value, 1); + std::transform(value.begin(), value.end(), value.begin(), ::tolower); + int found = value.find("green"); + if (found != string::npos){ + primitive->setColor(1,0); } + found = value.find("blue"); + if (found != string::npos){ + primitive->setColor(2,0); + } + found = value.find("red"); + if(found != string::npos){ + primitive->setColor(3,0); + } + found = value.find("black"); + if (found != string::npos){ + primitive->setColor(4,0); + } + found = value.find("white"); + if (found != string::npos){ + primitive->setColor(5,0); + } + } break; case 'g': //grade