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

Fix for issue 766 ("cancel" on opponent deck selection goes to the deckeditor)

Browse Source
This commit is contained in:
wagic.the.homebrew
2011-12-10 01:05:59 +00:00
parent fe78345ef7
commit 2030d34643
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDuel.cpp
+9 -3
View File
@@ -38,6 +38,7 @@ enum ENUM_DUEL_STATE
DUEL_STATE_DECK1_DETAILED_INFO, DUEL_STATE_DECK1_DETAILED_INFO,
DUEL_STATE_DECK2_DETAILED_INFO, DUEL_STATE_DECK2_DETAILED_INFO,
DUEL_STATE_CHOOSE_DECK1_TO_2, DUEL_STATE_CHOOSE_DECK1_TO_2,
DUEL_STATE_CHOOSE_DECK2_TO_1,
DUEL_STATE_CHOOSE_DECK2, DUEL_STATE_CHOOSE_DECK2,
DUEL_STATE_CHOOSE_DECK2_TO_PLAY, DUEL_STATE_CHOOSE_DECK2_TO_PLAY,
DUEL_STATE_ERROR_NO_DECK, DUEL_STATE_ERROR_NO_DECK,
@@ -373,6 +374,12 @@ void GameStateDuel::Update(float dt)
else else
deckmenu->Update(dt); deckmenu->Update(dt);
break; break;
case DUEL_STATE_CHOOSE_DECK2_TO_1:
if (opponentMenu->isClosed())
setGamePhase(DUEL_STATE_CHOOSE_DECK1);
else
opponentMenu->Update(dt);
break;
case DUEL_STATE_CHOOSE_DECK2: case DUEL_STATE_CHOOSE_DECK2:
if (mParent->players[1] == PLAYER_TYPE_HUMAN) if (mParent->players[1] == PLAYER_TYPE_HUMAN)
deckmenu->Update(dt); deckmenu->Update(dt);
@@ -674,7 +681,7 @@ void GameStateDuel::Render()
mFont->DrawString(_("LOADING DECKS").c_str(), 0, SCREEN_HEIGHT / 2); mFont->DrawString(_("LOADING DECKS").c_str(), 0, SCREEN_HEIGHT / 2);
else else
{ {
if (opponentMenu) if (opponentMenu && !opponentMenu->isClosed())
opponentMenu->Render(); opponentMenu->Render();
else if (deckmenu && !deckmenu->isClosed()) deckmenu->Render(); else if (deckmenu && !deckmenu->isClosed()) deckmenu->Render();
@@ -766,8 +773,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
{ {
opponentMenu->Close(); opponentMenu->Close();
deckmenu->Close(); deckmenu->Close();
mParent->SetNextState(DUEL_STATE_CHOOSE_DECK1); setGamePhase(DUEL_STATE_CHOOSE_DECK2_TO_1);
setGamePhase(DUEL_STATE_CHOOSE_DECK1);
break; break;
} }