Jeck - fix to issue 318.

This commit is contained in:
wagic.jeck
2010-02-10 15:48:38 +00:00
parent 4189c238b9
commit cf03d4cc64
4 changed files with 17 additions and 7 deletions
+4 -2
View File
@@ -63,6 +63,7 @@ void GameStateShop::Start(){
mTouched = false;
mStage = STAGE_FADE_IN;
mElapsed = 0;
needLoad = true;
booster = NULL;
srcCards = NEW WSrcUnlockedCards(0);
srcCards->setElapsed(15);
@@ -467,12 +468,13 @@ void GameStateShop::Update(float dt)
}
if(filterMenu){
if(btn == PSP_CTRL_SELECT){
filterMenu->Finish();
needLoad = filterMenu->Finish();
filterMenu->Update(dt);
return;
}
if(filterMenu->isFinished()){
load();
if(needLoad)
load();
mStage = STAGE_SHOP_SHOP;
}else{
filterMenu->CheckUserInput(btn);
+10 -4
View File
@@ -1299,18 +1299,24 @@ WGuiListRow::WGuiListRow(string n, WSyncable * s) : WGuiList(n,s) {
height = 20;
}
//WGuiFilterUI
void WGuiFilters::Finish(){
bool WGuiFilters::Finish(){
bFinished = true;
string src;
if(source){
string src = getCode();
src = getCode();
if(priorFilter == src)
return false;
source->clearFilters();
if(src.size()){
WCFilterFactory * wc = WCFilterFactory::GetInstance();
source->addFilter(wc->Construct(src));
}
if(!source->Size())
source->clearFilters(); //TODO: Pop a "No results found" warning.
if(!source->Size()){
source->clearFilters(); //TODO: Pop a "No results found" warning
}
}
priorFilter = src;
return true;
}
void WGuiFilters::ButtonPressed(int controllerId, int controlId){
if(controllerId == -102){