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

Erwan

Browse Source 
- swapped StyleManager.h and .StyleManager.cpp files in VC++ project
- attempt at fixing issue 451 (tokens in momir), please verify. Also attempt at fixing tokens in shop.
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-09-17 11:25:33 +00:00
parent 291b600bed
commit 341c48eb61
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGDeck.cpp
+3 -2
View File
@@ -610,8 +610,9 @@ int MTGDeck::addRandomCards(int howmany, int * setIds, int nbSets, int rarity, c
for (int i = 0; i < collectionTotal; i++){
MTGCard * card = database->_(i);
int r = card->getRarity();
if (r != Constants::RARITY_T && (rarity == -1 || r==rarity) &&
(!_subtype || card->data->hasSubtype(subtype))
if (r != Constants::RARITY_T && (rarity == -1 || r==rarity) && // remove tokens
card->setId != -1 && //remove cards that are defined in primitives. Those are workarounds (usually tokens) and should only be used internally
(!_subtype || card->data->hasSubtype(subtype))
){
int ok = 0;