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

60
projects/mtg/src/CardDescriptor.cpp
View File

@@ -101,6 +101,13 @@ bool CardDescriptor::valueInRange(int comparisonMode, int value, int criterion)
return false;
}
MTGCardInstance* CardDescriptor::match_not(MTGCardInstance * card)
{
// if we have a color match, return null
bool colorFound = (colors & card->colors) > 0;
return colorFound ? NULL : card;
}
MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card)
{
int found = 1;
@@ -128,27 +135,11 @@ MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card)
if (!found)
return NULL;
for (int i = 0; i < Constants::MTG_NB_COLORS; i++)
if (colors)
{
if (colors[i] == 1)
{
found = 0;
if (card->hasColor(i))
{
found = 1;
break;
}
}
else if (colors[i] == -1)
{
found = 0;
if (!card->hasColor(i))
{
found = 1;
break;
}
}
found = (colors & card->colors);
}
if (!found)
return NULL;
@@ -184,13 +175,8 @@ MTGCardInstance * CardDescriptor::match_and(MTGCardInstance * card)
}
}
}
for (int i = 0; i < Constants::MTG_NB_COLORS; i++)
{
if ((colors[i] == 1 && !card->hasColor(i)) || (colors[i] == -1 && card->hasColor(i)))
{
match = NULL;
}
}
if ((colors & card->colors) != colors)
match = NULL;
if (powerComparisonMode && !valueInRange(powerComparisonMode, card->getPower(), power))
match = NULL;
@@ -200,21 +186,7 @@ MTGCardInstance * CardDescriptor::match_and(MTGCardInstance * card)
match = NULL;
if(nameComparisonMode && compareName != card->name)
match = NULL;
if(colorComparisonMode)
{
bool hasMatch = false;
for (int i=0;i< Constants::MTG_NB_COLORS;i++)
{
if (card->hasColor(i) && colors[i] > 0)
{
hasMatch = true;
}
}
if( !hasMatch )
{
match = NULL;
}
}
return match;
}
@@ -226,10 +198,14 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
{
match = match_and(card);
}
else
else if (mode == CD_OR)
{
match = match_or(card);
}
else
{
match = match_not(card);
}
//Abilities
for (map<int, int>::const_iterator it = basicAbilities.begin(); it != basicAbilities.end(); ++it)