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

Erwan

Browse Source 
- attempt to fix issue 319. Jeck please review :)
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-03-01 13:43:46 +00:00
parent 855288fa87
commit c09dabfdbf
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDeckViewer.cpp
+9 -12
View File
@@ -138,8 +138,8 @@ void GameStateDeckViewer::Start()
menu->Add(22,"Filter by..."); menu->Add(22,"Filter by...");
menu->Add(2,"Switch decks without saving"); menu->Add(2,"Switch decks without saving");
menu->Add(1,"Save & Rename"); menu->Add(1,"Save & Rename");
menu->Add(3,"Back to Main Menu");
menu->Add(0,"Save & Back to Main Menu"); menu->Add(0,"Save & Back to Main Menu");
menu->Add(3,"Back to Main Menu");
menu->Add(4,"Cancel"); menu->Add(4,"Cancel");
//Icons //Icons
@@ -313,14 +313,7 @@ void GameStateDeckViewer::Update(float dt)
} }
stw.needUpdate = true; stw.needUpdate = true;
break; break;
/*case JGE_BTN_PRI :
if (last_user_activity < NO_USER_ACTIVITY_HELP_DELAY){
last_user_activity = NO_USER_ACTIVITY_HELP_DELAY + 1;
}else{
last_user_activity = 0;
mStage = STAGE_WAITING;
}
break;*/
case JGE_BTN_MENU : case JGE_BTN_MENU :
mStage = STAGE_MENU; mStage = STAGE_MENU;
break; break;
@@ -1039,7 +1032,8 @@ void GameStateDeckViewer::updateStats() {
return; return;
} }
AbilityFactory * af = NEW AbilityFactory(); //rmove filters away from the deck to count things correctly
WCardFilter* backup = myDeck->unhookFilters();
myDeck->validate(); myDeck->validate();
stw.needUpdate = false; stw.needUpdate = false;
@@ -1117,7 +1111,8 @@ void GameStateDeckViewer::updateStats() {
for (int i=0; i<(int)abilityStrings.size(); i++) { for (int i=0; i<(int)abilityStrings.size(); i++) {
found = abilityStrings.at(i).find("add"); found = abilityStrings.at(i).find("add");
if (found != (int)string::npos){ //Parse only mana abilities if (found != (int)string::npos){ //Parse only mana abilities
ab = af->parseMagicLine(abilityStrings.at(i),0,0,cin); AbilityFactory af;
ab = af.parseMagicLine(abilityStrings.at(i),0,0,cin);
AManaProducer * amp = dynamic_cast<AManaProducer*>(ab); AManaProducer * amp = dynamic_cast<AManaProducer*>(ab);
if (amp){ if (amp){
@@ -1194,7 +1189,9 @@ void GameStateDeckViewer::updateStats() {
stw.noCreaturesProbInTurn[i] = noLuck(stw.cardCount, stw.countCreatures, 7+i)*100; stw.noCreaturesProbInTurn[i] = noLuck(stw.cardCount, stw.countCreatures, 7+i)*100;
} }
SAFE_DELETE(af); //put filters back;
myDeck->addFilter(backup);
myDeck->validate();
} }
// This should probably be cached in DeckDataWrapper // This should probably be cached in DeckDataWrapper
projects/mtg/src/WDataSrc.cpp
-1
View File
@@ -276,7 +276,6 @@ void WSrcCards::Shuffle(){
} }
void WSrcCards::validate(){ void WSrcCards::validate(){
validated.clear(); validated.clear();
if(!filtersRoot) return;
for(size_t t=0;t<cards.size();t++){ for(size_t t=0;t<cards.size();t++){
if(matchesFilters(cards[t])) if(matchesFilters(cards[t]))
validated.push_back(t); validated.push_back(t);