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

added a prefernces screen to handle media card selection on Android devices. Contains actual fix for 4297.

Browse Source 
Added a place marker to allow volume change during app.  Right now it's either loud or off.  There isn't a way to allow the volume to gradually go up and odwn based on the values set in settings.
This commit is contained in:
techdragon.nguyen@gmail.com
2012-03-01 03:24:34 +00:00
parent 8b8020134d
commit 6124280f24
13 changed files with 604 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ BoosterDisplay::BoosterDisplay(int id, GameObserver* game, int x, int y, JGuiLis
bool BoosterDisplay::CheckUserInput(JButton key)
{
if (JGE_BTN_UP == key || JGE_BTN_DOWN == key)
if (JGE_BTN_UP == key || JGE_BTN_DOWN == key || JGE_BTN_PRI == key)
return false;
return CardDisplay::CheckUserInput(key);
@@ -608,17 +608,6 @@ void GameStateShop::Update(float dt)
taskList = NEW TaskList();
taskList->Start();
}
else if (btn == JGE_BTN_PRI)
{
srcCards->Shuffle();
load();
disablePurchase = false;
clearInput = true;
return;
}
else if (btn == JGE_BTN_CANCEL)
options[Options::DISABLECARDS].number = !options[Options::DISABLECARDS].number;
else if (boosterDisplay)
{
if (btn == JGE_BTN_SEC)
@@ -630,6 +619,17 @@ void GameStateShop::Update(float dt)
}
return;
}
else if (btn == JGE_BTN_PRI) // so we don't shuffle while we view our newly purchased booster display.
{
srcCards->Shuffle();
load();
disablePurchase = false;
clearInput = true;
return;
}
else if (btn == JGE_BTN_CANCEL)
options[Options::DISABLECARDS].number = !options[Options::DISABLECARDS].number;
else if (btn == JGE_BTN_SEC)
{
bListCards = !bListCards;