- 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:
@@ -85,11 +85,11 @@ WSrcCards * MTGPack::getPool(string poolstr)
|
||||
if (sub.size())
|
||||
{
|
||||
mySrc->addFilter(ff->Construct(sub));
|
||||
mySrc->loadMatches(GameApp::collection);
|
||||
mySrc->loadMatches(MTGCollection());
|
||||
mySrc->bakeFilters();
|
||||
}
|
||||
else
|
||||
mySrc->loadMatches(GameApp::collection);
|
||||
mySrc->loadMatches(MTGCollection());
|
||||
}
|
||||
mySrc->Shuffle();
|
||||
return mySrc;
|
||||
@@ -223,7 +223,7 @@ void MTGPack::load(string filename)
|
||||
es->copies = atoi(holder);
|
||||
else
|
||||
es->copies = 1;
|
||||
es->card = GameApp::collection->getCardByName(pEntry->Value());
|
||||
es->card = MTGCollection()->getCardByName(pEntry->Value());
|
||||
s->addEntry(es);
|
||||
}
|
||||
else if (tag == "random_card")
|
||||
|
||||
Reference in New Issue
Block a user