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

13
projects/mtg/src/WGui.cpp
View File

@@ -1326,18 +1326,21 @@ bool WGuiFilters::Finish(){
string src;
if(source){
src = getCode();
if(priorFilter == src && recolorTo == priorRecolor)
if(priorFilter == src && recolorTo < 0)
return false;
source->clearFilters();
if(src.size()){
WCFilterFactory * wc = WCFilterFactory::GetInstance();
WCardFilter * f = wc->Construct(src);
if(recolorTo > -1 && recolorTo < Constants::MTG_NB_COLORS){
if(!f->filtersColor())
f = NEW WCFilterAND(f,NEW WCFilterColor(recolorTo));
f->recolor(recolorTo);
f = NEW WCFilterAND(f,NEW WCFilterColor(recolorTo));
}
source->addFilter(f);
}else {
if(recolorTo > -1 && recolorTo < Constants::MTG_NB_COLORS){
WCardFilter * f = NEW WCFilterColor(recolorTo);
source->addFilter(f);
}
}
if(!source->Size()){
source->clearFilters(); //TODO: Pop a "No results found" warning
@@ -1382,11 +1385,9 @@ WGuiFilters::WGuiFilters(string header, WSrcCards * src) : WGuiItem(header) {
bFinished = false;
source = src;
recolorTo = -1;
priorRecolor = -1;
buildList();
}
void WGuiFilters::recolorFilter(int color){
priorRecolor = recolorTo;
recolorTo = color;
}
string WGuiFilters::getCode(){