- Moved the card collection out of the GameApp class to clean up the dependencies
- Added method to build a card collection independently of the GUI to ease my unitary test application - Added part of some network GUI I'm working on, it's #ifdef out, I'm only committing this part to ease later merges - Added the beginning of a serialization code of the Player and related classes used for network support - various other minor cleanup
This commit is contained in:
@@ -2797,7 +2797,7 @@ public:
|
||||
ActivatedAbility(_id, _source, _cost, 0, _doTap), tokenId(tokenId), starfound(starfound),multiplier(multiplier), who(who),aLivingWeapon(aLivingWeapon)
|
||||
{
|
||||
if (!multiplier) this->multiplier = NEW WParsedInt(1);
|
||||
MTGCard * card = GameApp::collection->getCardById(tokenId);
|
||||
MTGCard * card = MTGCollection()->getCardById(tokenId);
|
||||
if (card) name = card->data->getName();
|
||||
battleReady = false;
|
||||
}
|
||||
@@ -2868,7 +2868,7 @@ public:
|
||||
//MTGCardInstance * myToken;
|
||||
if (tokenId)
|
||||
{
|
||||
MTGCard * card = GameApp::collection->getCardById(tokenId);
|
||||
MTGCard * card = MTGCollection()->getCardById(tokenId);
|
||||
myToken = NEW MTGCardInstance(card, source->controller()->game);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user