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

Jeck - Fixed issue 93, duplicate issue 91.

Browse Source 
* Deck editor menus no longer fall through into each other.
This commit is contained in:
wagic.jeck
2009-09-30 22:24:21 +00:00
parent 247fb8d3ef
commit 98223b66f0
1 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDeckViewer.cpp
+55 -52
View File
@@ -103,11 +103,11 @@ void GameStateDeckViewer::Start()
stw.needUpdate = true; stw.needUpdate = true;
menu = NEW SimpleMenu(11,this,menuFont,SCREEN_WIDTH/2-100,20); menu = NEW SimpleMenu(11,this,menuFont,SCREEN_WIDTH/2-100,20);
menu->Add(11,"Save"); menu->Add(0,"Save");
menu->Add(12,"Save & Rename"); menu->Add(1,"Save & Rename");
menu->Add(13,"Switch decks without saving"); menu->Add(2,"Switch decks without saving");
menu->Add(14,"Back to main menu"); menu->Add(3,"Back to main menu");
menu->Add(15,"Cancel"); menu->Add(4,"Cancel");
//icon images //icon images
@@ -1191,7 +1191,7 @@ int GameStateDeckViewer::loadDeck(int deckid){
void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId) void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
{ {
switch(controllerId){ switch(controllerId){
case 10: case 10: //Deck menu
if (controlId == -1){ if (controlId == -1){
mParent->SetNextState(GAME_STATE_MENU); mParent->SetNextState(GAME_STATE_MENU);
break; break;
@@ -1200,53 +1200,56 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
mStage = STAGE_WAITING; mStage = STAGE_WAITING;
deckNum = controlId; deckNum = controlId;
break; break;
} case 11: //Save / exit menu
switch (controlId)
switch (controlId) {
{ case 0:
myDeck->save();
case 11: playerdata->save();
myDeck->save(); pricelist->save();
playerdata->save(); mStage = STAGE_WAITING;
pricelist->save(); break;
mStage = STAGE_WAITING; case 1:
break; if(myDeck && myDeck->parent){
case 12: options.keypadStart(myDeck->parent->meta_name,&newDeckname);
if(myDeck && myDeck->parent){ options.keypadTitle("Rename deck");
options.keypadStart(myDeck->parent->meta_name,&newDeckname); }
options.keypadTitle("Rename deck"); break;
case 2:
updateDecks();
mStage = STAGE_WELCOME;
break;
case 3:
mParent->SetNextState(GAME_STATE_MENU);
break;
case 4:
mStage = STAGE_WAITING;
break;
}
break;
case 2:
switch (controlId){
case 20:
{
MTGCard * card = cardIndex[2];
if (card){
int rnd = (rand() % 25);
playerdata->credits += price;
price = price - (rnd * price)/100;
pricelist->setPrice(card->getMTGId(),price*2);
#if defined (WIN32) || defined (LINUX)
char buf[4096];
sprintf(buf, "CARD'S NAME : %s", card->getName().c_str());
OutputDebugString(buf);
#endif
playerdata->collection->remove(card->getMTGId());
Remove(card);
}
}
case 21:
delSellMenu = 1;
break;
} }
break;
case 13:
updateDecks();
mStage = STAGE_WELCOME;
break;
case 14:
mParent->SetNextState(GAME_STATE_MENU);
break;
case 15:
mStage = STAGE_WAITING;
break;
case 20:
{
MTGCard * card = cardIndex[2];
if (card){
int rnd = (rand() % 25);
playerdata->credits += price;
price = price - (rnd * price)/100;
pricelist->setPrice(card->getMTGId(),price*2);
#if defined (WIN32) || defined (LINUX)
char buf[4096];
sprintf(buf, "CARD'S NAME : %s", card->getName().c_str());
OutputDebugString(buf);
#endif
playerdata->collection->remove(card->getMTGId());
Remove(card);
}
}
case 21:
delSellMenu = 1;
break;
} }
} }