- 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:
@@ -378,7 +378,7 @@ void WSrcCards::Sort(int method)
|
||||
WSrcUnlockedCards::WSrcUnlockedCards(float delay) :
|
||||
WSrcCards(delay)
|
||||
{
|
||||
MTGAllCards * ac = GameApp::collection;
|
||||
MTGAllCards * ac = MTGCollection();
|
||||
map<int, MTGCard*>::iterator it;
|
||||
|
||||
char * unlocked = NULL;
|
||||
@@ -549,7 +549,7 @@ int WSrcDeck::getCount(int count)
|
||||
int WSrcDeck::totalPrice()
|
||||
{
|
||||
int total = 0;
|
||||
PriceList * pricelist = NEW PriceList(JGE_GET_RES("settings/prices.dat").c_str(), GameApp::collection);
|
||||
PriceList * pricelist = NEW PriceList(JGE_GET_RES("settings/prices.dat").c_str(), MTGCollection());
|
||||
map<int, int>::iterator it;
|
||||
for (it = copies.begin(); it != copies.end(); it++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user