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

removed redundant code for card loading. getCardByName already loads by Id and caches the result

Browse Source 
duplicating that code in MTGDeck is redundant.
This commit is contained in:
techdragon.nguyen@gmail.com
2011-02-14 17:36:19 +00:00
parent 5b365e53f0
commit 73b2d5ded8
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGDeck.cpp
+13 -25
View File
@@ -676,7 +676,10 @@ MTGCard * MTGAllCards::getCardByName(string name)
if (!name.size()) return NULL; if (!name.size()) return NULL;
if (name[0] == '#') return NULL; if (name[0] == '#') return NULL;
map<string, MTGCard * >::iterator cached = mtgCardByNameCache.find(name); map<string, MTGCard * >::iterator cached = mtgCardByNameCache.end();
if (mtgCardByNameCache.size() > 0)
cached = mtgCardByNameCache.find(name);
if (cached!= mtgCardByNameCache.end()) if (cached!= mtgCardByNameCache.end())
{ {
return cached->second; return cached->second;
@@ -778,11 +781,11 @@ MTGDeck::MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_onl
continue; continue;
} }
if (meta_only) break; if (meta_only) break;
int nb = 1; int numberOfCopies = 1;
size_t found = s.find(" *"); size_t found = s.find(" *");
if (found != string::npos) if (found != string::npos)
{ {
nb = atoi(s.substr(found + 2).c_str()); numberOfCopies = atoi(s.substr(found + 2).c_str());
s = s.substr(0, found); s = s.substr(0, found);
} }
size_t diff = s.find("toggledifficulty:"); size_t diff = s.find("toggledifficulty:");
@@ -801,32 +804,17 @@ MTGDeck::MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_onl
s = cardeasy; s = cardeasy;
} }
} }
int cardnb = atoi(s.c_str()); MTGCard * card = database->getCardByName(s);
if (cardnb) if (card)
{ {
add(cardnb); for (int i = 0; i < numberOfCopies; i++)
{
add(card);
}
} }
else else
{ {
size_t found = s.find(" *"); DebugTrace("could not find Card matching name: " << s);
if (found != string::npos)
{
nb = atoi(s.substr(found + 2).c_str());
s = s.substr(0, found);
}
MTGCard * card = database->getCardByName(s);
if (card)
{
for (int i = 0; i < nb; i++)
{
add(card);
}
}
else
{
DebugTrace("could not find Card matching name: " << s);
}
} }
} }
file.close(); file.close();