No code change just reformatting of header files.
finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
This commit is contained in:
@@ -10,191 +10,383 @@ class MTGDeck;
|
||||
class MTGAllCards;
|
||||
class JQuad;
|
||||
|
||||
class WSyncable{
|
||||
class WSyncable
|
||||
{
|
||||
public:
|
||||
WSyncable(int i=0) {hooked = NULL;currentPos = 0;};
|
||||
virtual ~WSyncable() {};
|
||||
//Local
|
||||
virtual bool Hook(WSyncable* s);
|
||||
virtual int getOffset() {return currentPos;};
|
||||
virtual bool setOffset(int i) {currentPos = i; return true;};
|
||||
//Recursive
|
||||
virtual int getPos();
|
||||
virtual bool next();
|
||||
virtual bool prev();
|
||||
WSyncable(int i = 0)
|
||||
{
|
||||
hooked = NULL;
|
||||
currentPos = 0;
|
||||
}
|
||||
;
|
||||
virtual ~WSyncable()
|
||||
{
|
||||
}
|
||||
;
|
||||
//Local
|
||||
virtual bool Hook(WSyncable* s);
|
||||
virtual int getOffset()
|
||||
{
|
||||
return currentPos;
|
||||
}
|
||||
;
|
||||
virtual bool setOffset(int i)
|
||||
{
|
||||
currentPos = i;
|
||||
return true;
|
||||
}
|
||||
;
|
||||
//Recursive
|
||||
virtual int getPos();
|
||||
virtual bool next();
|
||||
virtual bool prev();
|
||||
protected:
|
||||
WSyncable * hooked; //Simple link list
|
||||
int currentPos;
|
||||
WSyncable * hooked; //Simple link list
|
||||
int currentPos;
|
||||
};
|
||||
|
||||
class WDataSource: public WSyncable{
|
||||
class WDataSource: public WSyncable
|
||||
{
|
||||
public:
|
||||
WDataSource() {};
|
||||
virtual JQuad * getImage(int offset=0) {return NULL;};
|
||||
virtual JQuad * getThumb(int offset=0) {return NULL;};
|
||||
virtual MTGCard * getCard(int offset=0, bool ignore=false) {return NULL;};
|
||||
virtual MTGDeck * getDeck(int offset=0) {return NULL;};
|
||||
virtual WDistort * getDistort(int offset=0) {return NULL;};
|
||||
virtual bool thisCard(int mtgid) {return false;};
|
||||
virtual int getControlID() {return -1;}; //TODO FIXME: Need a "not a valid button" define.
|
||||
virtual void Update(float dt) {mLastInput += dt;};
|
||||
virtual void Touch() {mLastInput = 0;};
|
||||
virtual float getElapsed() {return mLastInput;};
|
||||
virtual void setElapsed(float f) {mLastInput = f;};
|
||||
WDataSource()
|
||||
{
|
||||
}
|
||||
;
|
||||
virtual JQuad * getImage(int offset = 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
;
|
||||
virtual JQuad * getThumb(int offset = 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
;
|
||||
virtual MTGCard * getCard(int offset = 0, bool ignore = false)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
;
|
||||
virtual MTGDeck * getDeck(int offset = 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
;
|
||||
virtual WDistort * getDistort(int offset = 0)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
;
|
||||
virtual bool thisCard(int mtgid)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
;
|
||||
virtual int getControlID()
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
; //TODO FIXME: Need a "not a valid button" define.
|
||||
virtual void Update(float dt)
|
||||
{
|
||||
mLastInput += dt;
|
||||
}
|
||||
;
|
||||
virtual void Touch()
|
||||
{
|
||||
mLastInput = 0;
|
||||
}
|
||||
;
|
||||
virtual float getElapsed()
|
||||
{
|
||||
return mLastInput;
|
||||
}
|
||||
;
|
||||
virtual void setElapsed(float f)
|
||||
{
|
||||
mLastInput = f;
|
||||
}
|
||||
;
|
||||
protected:
|
||||
float mLastInput;
|
||||
float mLastInput;
|
||||
};
|
||||
|
||||
class WSrcImage: public WDataSource{
|
||||
class WSrcImage: public WDataSource
|
||||
{
|
||||
public:
|
||||
virtual JQuad * getImage(int offset=0);
|
||||
WSrcImage(string s);
|
||||
virtual JQuad * getImage(int offset = 0);
|
||||
WSrcImage(string s);
|
||||
|
||||
protected:
|
||||
string filename;
|
||||
string filename;
|
||||
};
|
||||
|
||||
class WSrcCards: public WDataSource{
|
||||
class WSrcCards: public WDataSource
|
||||
{
|
||||
protected:
|
||||
vector<MTGCard*> cards;
|
||||
vector<size_t> validated;
|
||||
WCardFilter * filtersRoot;
|
||||
float mDelay;
|
||||
vector<MTGCard*> cards;
|
||||
vector<size_t> validated;
|
||||
WCardFilter * filtersRoot;
|
||||
float mDelay;
|
||||
|
||||
public:
|
||||
WSrcCards(float delay=0.2);
|
||||
~WSrcCards();
|
||||
|
||||
virtual JQuad * getImage(int offset=0);
|
||||
virtual JQuad * getThumb(int offset=0);
|
||||
virtual MTGCard * getCard(int offset=0, bool ignore=false);
|
||||
WSrcCards(float delay = 0.2);
|
||||
~WSrcCards();
|
||||
|
||||
virtual int Size(bool all=false); //Returns the number of cards, or the number of cards that match the filter.
|
||||
virtual JQuad * getImage(int offset = 0);
|
||||
virtual JQuad * getThumb(int offset = 0);
|
||||
virtual MTGCard * getCard(int offset = 0, bool ignore = false);
|
||||
|
||||
virtual void Shuffle();
|
||||
virtual bool thisCard(int mtgid);
|
||||
virtual bool next();
|
||||
virtual bool prev();
|
||||
|
||||
virtual void Sort(int method);
|
||||
virtual bool setOffset(int pos);
|
||||
virtual bool isEmptySet(WCardFilter * f);
|
||||
virtual void addFilter(WCardFilter * f);
|
||||
virtual void clearFilters();
|
||||
virtual WCardFilter* unhookFilters();
|
||||
virtual bool matchesFilters(MTGCard * c);
|
||||
virtual void validate();
|
||||
virtual void bakeFilters(); //Discards all invalidated cards.
|
||||
virtual float filterFee();
|
||||
|
||||
virtual void updateCounts() {};
|
||||
virtual void clearCounts() {};
|
||||
virtual void addCount(MTGCard * c, int qty=1) {};
|
||||
virtual int Size(bool all = false); //Returns the number of cards, or the number of cards that match the filter.
|
||||
|
||||
//Loads into us. Calls validate()
|
||||
virtual int loadMatches(MTGAllCards* ac); //loadMatches adds the cards from something
|
||||
virtual int loadMatches(MTGDeck * deck); //into this, if it matches our filter
|
||||
virtual int loadMatches(WSrcCards* src, bool all=false); //If all==true, ignore filters on src.
|
||||
|
||||
//We put it into something else
|
||||
virtual int addRandomCards(MTGDeck * i, int howmany=1);
|
||||
virtual int addToDeck(MTGDeck * i, int num=-1); //Returns num that didn't add
|
||||
virtual WCardFilter * getFiltersRoot(){return filtersRoot;};
|
||||
virtual void Shuffle();
|
||||
virtual bool thisCard(int mtgid);
|
||||
virtual bool next();
|
||||
virtual bool prev();
|
||||
|
||||
enum {
|
||||
MAX_CYCLES = 4, //How many cycles to search, for addToDeck
|
||||
SORT_COLLECTOR,
|
||||
SORT_ALPHA,
|
||||
SORT_RARITY
|
||||
};
|
||||
virtual void Sort(int method);
|
||||
virtual bool setOffset(int pos);
|
||||
virtual bool isEmptySet(WCardFilter * f);
|
||||
virtual void addFilter(WCardFilter * f);
|
||||
virtual void clearFilters();
|
||||
virtual WCardFilter* unhookFilters();
|
||||
virtual bool matchesFilters(MTGCard * c);
|
||||
virtual void validate();
|
||||
virtual void bakeFilters(); //Discards all invalidated cards.
|
||||
virtual float filterFee();
|
||||
|
||||
virtual void updateCounts() {};
|
||||
virtual void clearCounts() {};
|
||||
virtual void addCount(MTGCard * c, int qty = 1) {};
|
||||
|
||||
//Loads into us. Calls validate()
|
||||
virtual int loadMatches(MTGAllCards* ac); //loadMatches adds the cards from something
|
||||
virtual int loadMatches(MTGDeck * deck); //into this, if it matches our filter
|
||||
virtual int loadMatches(WSrcCards* src, bool all = false); //If all==true, ignore filters on src.
|
||||
|
||||
//We put it into something else
|
||||
virtual int addRandomCards(MTGDeck * i, int howmany = 1);
|
||||
virtual int addToDeck(MTGDeck * i, int num = -1); //Returns num that didn't add
|
||||
virtual WCardFilter * getFiltersRoot()
|
||||
{
|
||||
return filtersRoot;
|
||||
}
|
||||
;
|
||||
|
||||
enum
|
||||
{
|
||||
MAX_CYCLES = 4, //How many cycles to search, for addToDeck
|
||||
SORT_COLLECTOR,
|
||||
SORT_ALPHA,
|
||||
SORT_RARITY
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
class WSrcDeckViewer: public WSrcCards{
|
||||
class WSrcDeckViewer: public WSrcCards
|
||||
{
|
||||
public:
|
||||
WSrcDeckViewer(WSrcCards * _active, WSrcCards * _inactive);
|
||||
~WSrcDeckViewer();
|
||||
void swapSrc();
|
||||
WSrcDeckViewer(WSrcCards * _active, WSrcCards * _inactive);
|
||||
~WSrcDeckViewer();
|
||||
void swapSrc();
|
||||
|
||||
//Wrapped functions
|
||||
JQuad * getImage(int offset=0) {return active->getImage(offset);};
|
||||
JQuad * getThumb(int offset=0) {return active->getThumb(offset);};
|
||||
MTGCard * getCard(int offset=0, bool ignore=false) {return active->getCard(offset,ignore);};
|
||||
int Size(bool all=false) {return active->Size();};
|
||||
WCardFilter * getfiltersRoot() {return active->getFiltersRoot();};
|
||||
void Shuffle() {active->Shuffle();};
|
||||
bool thisCard(int mtgid) {return active->thisCard(mtgid);};
|
||||
bool next() {return active->next();};
|
||||
bool prev() {return active->prev();};
|
||||
void Sort(int method) {active->Sort(method);};
|
||||
bool setOffset(int pos) {return active->setOffset(pos);};
|
||||
bool isEmptySet(WCardFilter * f) {return active->isEmptySet(f);};
|
||||
void addFilter(WCardFilter * f) {active->addFilter(f);};
|
||||
void clearFilters() {active->clearFilters();};
|
||||
WCardFilter* unhookFilters() {return active->unhookFilters();};
|
||||
bool matchesFilters(MTGCard * c) {return active->matchesFilters(c);};
|
||||
void validate() {active->validate();};
|
||||
void bakeFilters() {active->bakeFilters();}; //Discards all invalidated cards.
|
||||
float filterFee() {return active->filterFee();};
|
||||
void updateCounts() {active->updateCounts();};
|
||||
void clearCounts() {active->clearCounts();};
|
||||
void addCount(MTGCard * c, int qty=1) { active->addCount(c,qty); };
|
||||
int loadMatches(MTGAllCards* ac) {return active->loadMatches(ac);};
|
||||
int loadMatches(MTGDeck * deck) {return active->loadMatches(deck);};
|
||||
int loadMatches(WSrcCards* src, bool all=false) {return loadMatches(src,all);};
|
||||
int addRandomCards(MTGDeck * i, int howmany=1) {return active->addRandomCards(i,howmany);};
|
||||
int addToDeck(MTGDeck * i, int num=-1) {return active->addToDeck(i,num);};
|
||||
//Wrapped functions
|
||||
JQuad * getImage(int offset = 0)
|
||||
{
|
||||
return active->getImage(offset);
|
||||
}
|
||||
;
|
||||
JQuad * getThumb(int offset = 0)
|
||||
{
|
||||
return active->getThumb(offset);
|
||||
}
|
||||
;
|
||||
MTGCard * getCard(int offset = 0, bool ignore = false)
|
||||
{
|
||||
return active->getCard(offset, ignore);
|
||||
}
|
||||
;
|
||||
int Size(bool all = false)
|
||||
{
|
||||
return active->Size();
|
||||
}
|
||||
;
|
||||
WCardFilter * getfiltersRoot()
|
||||
{
|
||||
return active->getFiltersRoot();
|
||||
}
|
||||
;
|
||||
void Shuffle()
|
||||
{
|
||||
active->Shuffle();
|
||||
}
|
||||
;
|
||||
bool thisCard(int mtgid)
|
||||
{
|
||||
return active->thisCard(mtgid);
|
||||
}
|
||||
;
|
||||
bool next()
|
||||
{
|
||||
return active->next();
|
||||
}
|
||||
;
|
||||
bool prev()
|
||||
{
|
||||
return active->prev();
|
||||
}
|
||||
;
|
||||
void Sort(int method)
|
||||
{
|
||||
active->Sort(method);
|
||||
}
|
||||
;
|
||||
bool setOffset(int pos)
|
||||
{
|
||||
return active->setOffset(pos);
|
||||
}
|
||||
;
|
||||
bool isEmptySet(WCardFilter * f)
|
||||
{
|
||||
return active->isEmptySet(f);
|
||||
}
|
||||
;
|
||||
void addFilter(WCardFilter * f)
|
||||
{
|
||||
active->addFilter(f);
|
||||
}
|
||||
;
|
||||
void clearFilters()
|
||||
{
|
||||
active->clearFilters();
|
||||
}
|
||||
;
|
||||
WCardFilter* unhookFilters()
|
||||
{
|
||||
return active->unhookFilters();
|
||||
}
|
||||
;
|
||||
bool matchesFilters(MTGCard * c)
|
||||
{
|
||||
return active->matchesFilters(c);
|
||||
}
|
||||
;
|
||||
void validate()
|
||||
{
|
||||
active->validate();
|
||||
}
|
||||
;
|
||||
void bakeFilters()
|
||||
{
|
||||
active->bakeFilters();
|
||||
}
|
||||
; //Discards all invalidated cards.
|
||||
float filterFee()
|
||||
{
|
||||
return active->filterFee();
|
||||
}
|
||||
;
|
||||
void updateCounts()
|
||||
{
|
||||
active->updateCounts();
|
||||
}
|
||||
;
|
||||
void clearCounts()
|
||||
{
|
||||
active->clearCounts();
|
||||
}
|
||||
;
|
||||
void addCount(MTGCard * c, int qty = 1)
|
||||
{
|
||||
active->addCount(c, qty);
|
||||
}
|
||||
;
|
||||
int loadMatches(MTGAllCards* ac)
|
||||
{
|
||||
return active->loadMatches(ac);
|
||||
}
|
||||
;
|
||||
int loadMatches(MTGDeck * deck)
|
||||
{
|
||||
return active->loadMatches(deck);
|
||||
}
|
||||
;
|
||||
int loadMatches(WSrcCards* src, bool all = false)
|
||||
{
|
||||
return loadMatches(src, all);
|
||||
}
|
||||
;
|
||||
int addRandomCards(MTGDeck * i, int howmany = 1)
|
||||
{
|
||||
return active->addRandomCards(i, howmany);
|
||||
}
|
||||
;
|
||||
int addToDeck(MTGDeck * i, int num = -1)
|
||||
{
|
||||
return active->addToDeck(i, num);
|
||||
}
|
||||
;
|
||||
protected:
|
||||
WSrcCards * active;
|
||||
WSrcCards * inactive;
|
||||
WSrcCards * active;
|
||||
WSrcCards * inactive;
|
||||
};
|
||||
|
||||
class WSrcUnlockedCards: public WSrcCards{ //Only unlocked cards.
|
||||
class WSrcUnlockedCards: public WSrcCards
|
||||
{ //Only unlocked cards.
|
||||
public:
|
||||
WSrcUnlockedCards(float mDelay=0.2);
|
||||
WSrcUnlockedCards(float mDelay = 0.2);
|
||||
};
|
||||
|
||||
class WSrcDeck: public WSrcCards{
|
||||
class WSrcDeck: public WSrcCards
|
||||
{
|
||||
public:
|
||||
WSrcDeck(float delay=0.2) : WSrcCards(delay) {clearCounts();};
|
||||
virtual int loadMatches(MTGDeck * deck);
|
||||
virtual int Add(MTGCard * c, int quantity=1);
|
||||
virtual int Remove(MTGCard * c, int quantity=1, bool erase=false);
|
||||
void Rebuild(MTGDeck * d);
|
||||
int count(MTGCard * c);
|
||||
int countByName(MTGCard * card, bool editions=false);
|
||||
int totalPrice();
|
||||
enum {
|
||||
//0 to MTG_NB_COLORS are colors. See MTG_COLOR_ in Constants::.
|
||||
UNFILTERED_COPIES = Constants::MTG_NB_COLORS,
|
||||
UNFILTERED_UNIQUE,
|
||||
UNFILTERED_MIN_COPIES, //For 'unlock all' cheat, awards screen
|
||||
UNFILTERED_MAX_COPIES, //future use in format restriction, awards screen
|
||||
FILTERED_COPIES,
|
||||
FILTERED_UNIQUE,
|
||||
MAX_COUNTS
|
||||
};
|
||||
void clearCounts();
|
||||
void updateCounts();
|
||||
void addCount(MTGCard * c, int qty=1);
|
||||
int getCount(int count=UNFILTERED_COPIES);
|
||||
WSrcDeck(float delay = 0.2) :
|
||||
WSrcCards(delay)
|
||||
{
|
||||
clearCounts();
|
||||
}
|
||||
;
|
||||
virtual int loadMatches(MTGDeck * deck);
|
||||
virtual int Add(MTGCard * c, int quantity = 1);
|
||||
virtual int Remove(MTGCard * c, int quantity = 1, bool erase = false);
|
||||
void Rebuild(MTGDeck * d);
|
||||
int count(MTGCard * c);
|
||||
int countByName(MTGCard * card, bool editions = false);
|
||||
int totalPrice();
|
||||
enum
|
||||
{
|
||||
//0 to MTG_NB_COLORS are colors. See MTG_COLOR_ in Constants::.
|
||||
UNFILTERED_COPIES = Constants::MTG_NB_COLORS,
|
||||
UNFILTERED_UNIQUE,
|
||||
UNFILTERED_MIN_COPIES, //For 'unlock all' cheat, awards screen
|
||||
UNFILTERED_MAX_COPIES, //future use in format restriction, awards screen
|
||||
FILTERED_COPIES,
|
||||
FILTERED_UNIQUE,
|
||||
MAX_COUNTS
|
||||
};
|
||||
void clearCounts();
|
||||
void updateCounts();
|
||||
void addCount(MTGCard * c, int qty = 1);
|
||||
int getCount(int count = UNFILTERED_COPIES);
|
||||
protected:
|
||||
map<int,int> copies; //Maps MTGID to card counts.
|
||||
int counts[MAX_COUNTS];
|
||||
map<int, int> copies; //Maps MTGID to card counts.
|
||||
int counts[MAX_COUNTS];
|
||||
};
|
||||
|
||||
struct WCSortCollector{
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
struct WCSortCollector
|
||||
{
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
};
|
||||
|
||||
struct WCSortAlpha{
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
struct WCSortAlpha
|
||||
{
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
};
|
||||
|
||||
struct WCSortRarity{
|
||||
int rareToInt(char r);
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
struct WCSortRarity
|
||||
{
|
||||
int rareToInt(char r);
|
||||
bool operator()(const MTGCard*l, const MTGCard*r);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user