QTfrontend/hwform.cpp
changeset 788 00720357601f
parent 724 21706280d913
child 869 daddcd31ef34
--- a/QTfrontend/hwform.cpp	Thu Feb 21 19:31:53 2008 +0000
+++ b/QTfrontend/hwform.cpp	Fri Feb 22 16:07:16 2008 +0000
@@ -64,9 +64,6 @@
 	connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
 	connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
 
-	connect(ui.pageSimpleGame->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
-	connect(ui.pageSimpleGame->BtnSimpleGame,	SIGNAL(clicked()),	this, SLOT(SimpleGame()));
-
 	connect(ui.pageEditTeam->BtnTeamSave,	SIGNAL(clicked()),	this, SLOT(TeamSave()));
 	connect(ui.pageEditTeam->BtnTeamDiscard,	SIGNAL(clicked()),	this, SLOT(TeamDiscard()));
 
@@ -109,7 +106,7 @@
 
 	connect(ui.pageGameStats->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
 
-	connect(ui.pageSinglePlayer->BtnSimpleGamePage,	SIGNAL(clicked()),	this, SLOT(GoToSimpleGame()));
+	connect(ui.pageSinglePlayer->BtnSimpleGamePage,	SIGNAL(clicked()),	this, SLOT(SimpleGame()));
 	connect(ui.pageSinglePlayer->BtnTrainPage,	SIGNAL(clicked()),	this, SLOT(GoToTraining()));
 	connect(ui.pageSinglePlayer->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
 
@@ -135,7 +132,6 @@
   // FIXME: rewrite this with boost (or TR1/0x)
   QVector<QComboBox*> combos;
   combos.push_back(ui.pageOptions->WeaponsName);
-  combos.push_back(ui.pageSimpleGame->gameCFG->WeaponsName);
   combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName);
   combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName);
 
@@ -184,11 +180,6 @@
 	GoToPage(ID_PAGE_SINGLEPLAYER);
 }
 
-void HWForm::GoToSimpleGame()
-{
-	GoToPage(ID_PAGE_SIMPLEGAME);
-}
-
 void HWForm::GoToTraining()
 {
 	GoToPage(ID_PAGE_TRAINING);
@@ -363,7 +354,7 @@
 
 void HWForm::SimpleGame()
 {
-	CreateGame(ui.pageSimpleGame->gameCFG, 0, cDefaultAmmoStore->mid(10));
+	CreateGame(0, 0, cDefaultAmmoStore->mid(10));
 	game->StartQuick();
 }