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

Jeck - Removed parts of code that were mistakenly committed.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-08 14:03:46 +00:00
parent 8c187f8d12
commit 4279658379
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateMenu.cpp
-9
View File
@@ -57,7 +57,6 @@ enum
SUBMENUITEM_CLASSIC, SUBMENUITEM_CLASSIC,
SUBMENUITEM_RANDOM1, SUBMENUITEM_RANDOM1,
SUBMENUITEM_RANDOM2, SUBMENUITEM_RANDOM2,
SUBMENUITEM_PEASANT,
}; };
@@ -453,8 +452,6 @@ void GameStateMenu::Update(float dt)
subMenuController->Add(SUBMENUITEM_RANDOM1, "Random 1 Color"); subMenuController->Add(SUBMENUITEM_RANDOM1, "Random 1 Color");
subMenuController->Add(SUBMENUITEM_RANDOM2, "Random 2 Colors"); subMenuController->Add(SUBMENUITEM_RANDOM2, "Random 2 Colors");
} }
if(true)
subMenuController->Add(SUBMENUITEM_PEASANT, "Peasant's Magic");
subMenuController->Add(SUBMENUITEM_CANCEL, "Cancel"); subMenuController->Add(SUBMENUITEM_CANCEL, "Cancel");
} }
}else{ }else{
@@ -673,12 +670,6 @@ JLBFont * mFont = resources.GetJLBFont(Constants::MENU_FONT);
subMenuController->Close(); subMenuController->Close();
currentState = MENU_STATE_MAJOR_DUEL | MENU_STATE_MINOR_SUBMENU_CLOSING; currentState = MENU_STATE_MAJOR_DUEL | MENU_STATE_MINOR_SUBMENU_CLOSING;
break; break;
case SUBMENUITEM_PEASANT:
this->hasChosenGameType = 1;
mParent->gameType = GAME_TYPE_PEASANT;
subMenuController->Close();
currentState = MENU_STATE_MAJOR_DUEL | MENU_STATE_MINOR_SUBMENU_CLOSING;
break;
#ifdef TESTSUITE #ifdef TESTSUITE
case SUBMENUITEM_TESTSUITE: case SUBMENUITEM_TESTSUITE:
mParent->players[0] = PLAYER_TYPE_TESTSUITE; mParent->players[0] = PLAYER_TYPE_TESTSUITE;