Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jeck - Daily build & fix to r1895. Now the deck editor does what I thought it did.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-17 15:16:59 +00:00
parent 8f130856da
commit 4fd38766b1
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/mtg/include/WFilter.h
View File

@@ -19,8 +19,6 @@ private:
class WCardFilter{
public:
WCardFilter() {};
virtual void recolor(int mtgcolor) {};
virtual bool filtersColor() {return false;};
virtual ~WCardFilter() {};
virtual bool isMatch(MTGCard * c) {return true;};
virtual string getCode() = 0;
@@ -31,10 +29,8 @@ class WCFBranch: public WCardFilter{
public:
WCFBranch(WCardFilter * a, WCardFilter * b) {lhs=a;rhs=b;};
~WCFBranch() {SAFE_DELETE(lhs); SAFE_DELETE(rhs);};
virtual bool filtersColor() {return (rhs->filtersColor() || lhs->filtersColor());};
virtual bool isMatch(MTGCard * c) = 0;
virtual string getCode() = 0;
virtual void recolor(int mtgcolor) {rhs->recolor(mtgcolor);lhs->recolor(mtgcolor);};
virtual WCardFilter * Right(){return rhs;};
virtual WCardFilter * Left(){return lhs;};
protected:
@@ -61,8 +57,6 @@ class WCFilterGROUP: public WCardFilter{
public:
WCFilterGROUP(WCardFilter * _k) {kid = _k;};
~WCFilterGROUP() {SAFE_DELETE(kid);};
virtual void recolor(int mtgcolor) {kid->recolor(mtgcolor);};
virtual bool filtersColor() {return (kid->filtersColor());};
bool isMatch(MTGCard *c) {return kid->isMatch(c);};
string getCode();
float filterFee() {return kid->filterFee();};
@@ -74,8 +68,6 @@ class WCFilterNOT: public WCardFilter{
public:
WCFilterNOT(WCardFilter * _k) {kid = _k;};
~WCFilterNOT() {SAFE_DELETE(kid);};
virtual void recolor(int mtgcolor) {kid->recolor(mtgcolor);};
virtual bool filtersColor() {return (kid->filtersColor());};
bool isMatch(MTGCard *c) {return !kid->isMatch(c);};
string getCode();
protected:
@@ -113,11 +105,9 @@ protected:
class WCFilterColor: public WCardFilter{
public:
WCFilterColor(int _c) {color = _c;};
virtual void recolor(int mtgcolor) {color = mtgcolor;};
WCFilterColor(string arg);
bool isMatch(MTGCard * c);
string getCode();
bool filtersColor() {return true;};
float filterFee() {return 0.2f;};
protected:
int color;
@@ -134,8 +124,6 @@ public:
WCFilterProducesColor(int _c) : WCFilterColor(_c) {};
WCFilterProducesColor(string arg) : WCFilterColor(arg) {};
bool isMatch(MTGCard * c);
void recolor(int mtgcolor) {return;};
bool filtersColor() {return false;}; //We only want to know about filtering against card color, not produced.
string getCode();
};
class WCFilterNumeric: public WCardFilter{

2
projects/mtg/include/WGui.h
View File

@@ -434,7 +434,7 @@ protected:
vector< pair<string,string> > tempArgs; //TODO FIXME this is inefficient
bool bFinished;
string priorFilter;
int recolorTo, priorRecolor;
int recolorTo;
WSrcCards* source;
SimpleMenu* subMenu;
WGuiList * list;