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

Jeck - Linked task menu into shop's r-trigger.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-15 22:02:28 +00:00
parent 2faabf98b5
commit 92979fb184
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/mtg/src/GameStateShop.cpp
View File

@@ -383,7 +383,7 @@ void GameStateShop::Update(float dt)
btn = mEngine->ReadButton(); btn = mEngine->ReadButton();
taskList->Update(dt); taskList->Update(dt);
if ( taskList->getState() != TaskList::TASKS_INACTIVE){ if ( taskList->getState() != TaskList::TASKS_INACTIVE){
if ( btn == JGE_BTN_SEC || btn == JGE_BTN_CANCEL ){ if ( btn == JGE_BTN_SEC || btn == JGE_BTN_CANCEL || btn == JGE_BTN_PREV ){
taskList->End(); taskList->End();
return; return;
} else if (taskList->getState() == TaskList::TASKS_ACTIVE && btn == JGE_BTN_MENU){ } else if (taskList->getState() == TaskList::TASKS_ACTIVE && btn == JGE_BTN_MENU){
@@ -450,6 +450,12 @@ void GameStateShop::Update(float dt)
return; return;
} else if (btn == JGE_BTN_CTRL) } else if (btn == JGE_BTN_CTRL)
beginFilters(); beginFilters();
else if(btn == JGE_BTN_NEXT){
mStage = STAGE_SHOP_TASKS;
if (!taskList)
taskList = NEW TaskList();
taskList->Start();
}
else if (btn == JGE_BTN_PRI) { else if (btn == JGE_BTN_PRI) {
srcCards->Shuffle(); srcCards->Shuffle();
load(); load();