- 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:
@@ -226,7 +226,7 @@ bool GameStateAwards::enterSet(int setid)
|
||||
|
||||
setSrc = NEW WSrcCards();
|
||||
setSrc->addFilter(NEW WCFilterSet(setid));
|
||||
setSrc->loadMatches(mParent->collection);
|
||||
setSrc->loadMatches(MTGCollection());
|
||||
setSrc->bakeFilters();
|
||||
setSrc->Sort(WSrcCards::SORT_COLLECTOR);
|
||||
|
||||
@@ -255,7 +255,7 @@ bool GameStateAwards::enterStats(int option)
|
||||
{
|
||||
if (option != Options::AWARD_COLLECTOR)
|
||||
return false;
|
||||
DeckDataWrapper* ddw = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), mParent->collection));
|
||||
DeckDataWrapper* ddw = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), MTGCollection()));
|
||||
if (!ddw)
|
||||
return false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user