- 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:
@@ -1696,7 +1696,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
|
||||
}
|
||||
if (tokenId)
|
||||
{
|
||||
MTGCard * safetycard = GameApp::collection->getCardById(tokenId);
|
||||
MTGCard * safetycard = MTGCollection()->getCardById(tokenId);
|
||||
if (safetycard)
|
||||
{//contenue
|
||||
ATokenCreator * tok = NEW ATokenCreator(id, card,target, NULL, tokenId, 0, starfound, multiplier, who);
|
||||
@@ -2969,7 +2969,7 @@ int AbilityFactory::getAbilities(vector<MTGAbility *> * v, Spell * spell, MTGCar
|
||||
}
|
||||
if (card->alias && magicText.size() == 0 && !dest)
|
||||
{
|
||||
MTGCard * c = GameApp::collection->getCardById(card->alias);
|
||||
MTGCard * c = MTGCollection()->getCardById(card->alias);
|
||||
if (!c)
|
||||
return 0;
|
||||
magicText = c->data->magicText;
|
||||
|
||||
Reference in New Issue
Block a user