Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reducing the memory footprint: reworked the concept of 'colors' in CardPrimitives. What used to be an array of ints (ie 28 bytes) is now contained in a single byte, we use bit masking to support setting multiple colors on this variable. This also eliminates a lot of silly loops for setting colors in the code - now it's a straight byte copy.

Browse Source 
Also thrown in are a couple of string to const string& conversions.
This commit is contained in:
wrenczes@gmail.com
2011-04-25 11:20:07 +00:00
parent b8310838f4
commit 1cbf3db582
8 changed files with 162 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
projects/mtg/src/TargetChooser.cpp
View File

@@ -507,13 +507,11 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
}
else if( CDtype.find("color") != string::npos )
{
for(int i = 0; i < Constants::MTG_NB_COLORS; i++)
{
if(card->target)
cd->colors[i] = card->target->colors[i];
else
cd->colors[i] = card->colors[i];
}
if(card->target)
cd->colors = card->target->colors;
else
cd->colors = card->colors;
cd->mode = CD_OR;
}
else if( CDtype.find("types") != string::npos )
@@ -571,20 +569,17 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
else
{
int attributefound = 0;
//Colors
//Colors - remove Artifact and Land from the loop
for (int cid = 1; cid < Constants::MTG_NB_COLORS - 1; cid++)
{ //remove Artifact and Land from the loop
{
if (attribute.find(Constants::MTGColorStrings[cid]) != string::npos)
{
attributefound = 1;
if (minus)
{
cd->colors[cid] = -1;
}
else
{
cd->colors[cid] = 1;
cd->mode = CD_NOT;
}
cd->setColor(cid);
}
}
if (!attributefound)
@@ -621,7 +616,8 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
}
}
}
if (nbminuses) cd->mode = CD_AND;
if (nbminuses && cd->mode != CD_NOT)
cd->mode = CD_AND;
typeName = typeName.substr(0, found);
}
//X targets allowed ?