diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat index a78308d61..3db74e229 100644 --- a/projects/mtg/bin/Res/sets/ICE/_cards.dat +++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat @@ -516,7 +516,7 @@ mana={3}{B} power=1 subtype=Shade toughness=2 -[/card +[/card] [card] text=Target creature gets +X/+0 until end of turn. id=2456 @@ -1049,7 +1049,7 @@ name=Rally rarity=C type=Instant mana={W}{W} -[/card +[/card] [card] text=Target player puts the top card of his or her library into his or her graveyard. Draw a card at the beginning of the next turn's upkeep. id=2529 @@ -1358,7 +1358,7 @@ name=Thoughtleech rarity=U type=Enchantment mana={G}{G} -[/card +[/card] [card] text=Defender (This creature can't attack.) Flying. {U}: Thunder Wall gets +1/+1 until end of turn. id=2540 diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat index 09c1af04f..4d6025b0e 100644 --- a/projects/mtg/bin/Res/sets/LEG/_cards.dat +++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat @@ -649,7 +649,7 @@ subtype=Human power=4 toughness=5 abilities=legendary -[/cards] +[/card] [card] text=Legendary name=Jedit Ojanen @@ -662,7 +662,7 @@ subtype=Cat Warrior power=5 toughness=5 abilities=legendary -[/cards] +[/card] [card] text=Legendary name=Jerrard of the Closed Fist @@ -675,7 +675,7 @@ subtype=Human Knight power=6 toughness=5 abilities=legendary -[/cards] +[/card] [card] text=Legendary {T}: Add {W} to your mana pool. {W}, {T}: Return target legendary creature to its owner's hand. id=1701 @@ -698,7 +698,7 @@ subtype=Human Warrior power=5 toughness=3 abilities=legendary -[/cards] +[/card] [card] name=Keepers of the Faith id=1622 @@ -709,7 +709,7 @@ type=Creature subtype=Human Cleric power=2 toughness=3 -[/cards] +[/card] [card] text=Flying {G}: Killer Bees gets +1/+1 until end of turn. id=1532 @@ -908,7 +908,7 @@ subtype=Yeti power=3 toughness=2 abilities=mountainwalk,protection from white -[/cards] +[/card] [card] text=Legendary {B}{R}: Pavel Maliki gets +1/+0 until end of turn. id=1674 diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat index 202aa59ca..8d95b006e 100644 --- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat +++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat @@ -1358,4 +1358,4 @@ type=Creature subtype=Cat power=3 toughness=3 -[/card] \ No newline at end of file +[/card] diff --git a/projects/mtg/include/GameStateDeckViewer.h b/projects/mtg/include/GameStateDeckViewer.h index 7ccc40e7b..23c7aec49 100644 --- a/projects/mtg/include/GameStateDeckViewer.h +++ b/projects/mtg/include/GameStateDeckViewer.h @@ -641,7 +641,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener JRenderer::GetInstance()->RenderQuad(quad, x , y , 0.0f,scale,scale); if (showName){ char buffer[4096]; - sprintf(buffer, "%s", _(card->getName())); + sprintf(buffer, "%s", _(card->getName()).c_str()); float scaleBackup = mFont->GetScale(); mFont->SetScale(scale); mFont->DrawString(buffer,x,y); diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index b0774486d..f2dae0fc3 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -176,7 +176,7 @@ vector MTGMomirRule::pool[20]; MTGMomirRule::MTGMomirRule(int _id, MTGAllCards * _collection):MTGAbility(_id, NULL){ collection = _collection; if (!initialized){ - for (int i = 0; i < collection->ids.size(); i++){ + for (size_t i = 0; i < collection->ids.size(); i++){ MTGCard * card = collection->collection[collection->ids[i]]; if (card->isACreature()){ int convertedCost = card->getManaCost()->getConvertedCost(); diff --git a/projects/mtg/src/ShopItem.cpp b/projects/mtg/src/ShopItem.cpp index 6a7951c0e..efb8403f0 100644 --- a/projects/mtg/src/ShopItem.cpp +++ b/projects/mtg/src/ShopItem.cpp @@ -250,7 +250,7 @@ void ShopItems::ButtonPressed(int controllerId, int controlId){ }else{ safeDeleteDisplay(); display = NEW CardDisplay(12,NULL, SCREEN_WIDTH - 200, SCREEN_HEIGHT/2,this,NULL,5); - int curNbcards = playerdata->collection->totalCards(); + MTGDeck * tempDeck = NEW MTGDeck(NULL,playerdata->collection->database); tempDeck->addRandomCards(1, setIds[showPriceDialog],Constants::RARITY_R);