Mercurial Mercurial > hedgewars / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QTfrontend/hwform.cpp
changeset 696 d6f32ed6edc8
parent 695 34a93d123712
child 697 44f167938201
equal deleted inserted replaced
695:34a93d123712 696:d6f32ed6edc8 
   124 
   124 
   125 void HWForm::UpdateWeapons()
 
   125 void HWForm::UpdateWeapons()
 
   126 {
 
   126 {
 
   127   ui.pageOptions->WeaponsName->clear();
 
   127   ui.pageOptions->WeaponsName->clear();
 
   128   ui.pageOptions->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames());
 
   128   ui.pageOptions->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames());
 
       
   129 
       
   130   ui.pageMultiplayer->gameCFG->WeaponsName->clear();
 
       
   131   ui.pageMultiplayer->gameCFG->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames());
 
       
   132 
       
   133   ui.pageNetGame->pGameCFG->WeaponsName->clear();
 
       
   134   ui.pageNetGame->pGameCFG->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames());
 
   129 }
 
   135 }
 
   130 
   136 
   131 void HWForm::UpdateTeamsLists(const QStringList* editable_teams)
 
   137 void HWForm::UpdateTeamsLists(const QStringList* editable_teams)
 
   132 {
 
   138 {
 
   133 	QStringList teamslist;
 
   139 	QStringList teamslist;
 
   334 	GoBack();
 
   340 	GoBack();
 
   335 }
 
   341 }
 
   336 
   342 
   337 void HWForm::SimpleGame()
 
   343 void HWForm::SimpleGame()
 
   338 {
 
   344 {
 
   339 	CreateGame(ui.pageSimpleGame->gameCFG, 0);
 
   345 	CreateGame(ui.pageSimpleGame->gameCFG, 0, cDefaultAmmoStore->mid(10));
 
   340 	game->StartQuick();
 
   346 	game->StartQuick();
 
   341 }
 
   347 }
 
   342 
   348 
   343 void HWForm::PlayDemo()
 
   349 void HWForm::PlayDemo()
 
   344 {
 
   350 {
 
   349 				tr("Error"),
 
   355 				tr("Error"),
 
   350 				tr("Please, select record from the list above"),
 
   356 				tr("Please, select record from the list above"),
 
   351 				tr("OK"));
 
   357 				tr("OK"));
 
   352 		return ;
 
   358 		return ;
 
   353 	}
 
   359 	}
 
   354 	CreateGame(0, 0);
 
   360 	CreateGame(0, 0, 0);
 
   355 	game->PlayDemo(curritem->data(Qt::UserRole).toString());
 
   361 	game->PlayDemo(curritem->data(Qt::UserRole).toString());
 
   356 }
 
   362 }
 
   357 
   363 
   358 void HWForm::NetConnectServer(const QString & host, quint16 port)
 
   364 void HWForm::NetConnectServer(const QString & host, quint16 port)
 
   359 {
 
   365 {
 
   500   ui.pageNetGame->pNetTeamsWidget->addTeam(team);
 
   506   ui.pageNetGame->pNetTeamsWidget->addTeam(team);
 
   501 }
 
   507 }
 
   502 
   508 
   503 void HWForm::StartMPGame()
 
   509 void HWForm::StartMPGame()
 
   504 {
 
   510 {
 
   505 	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect);
 
   511 	QString ammo=ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageMultiplayer->gameCFG->WeaponsName->currentText());
 
       
   512 
       
   513 	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);
 
   506 
   514 
   507 	game->StartLocal();
 
   515 	game->StartLocal();
 
   508 }
 
   516 }
 
   509 
   517 
   510 void HWForm::GameStateChanged(GameState gameState)
 
   518 void HWForm::GameStateChanged(GameState gameState)
 
   563 			break;
 
   571 			break;
 
   564 		}
 
   572 		}
 
   565 	}
 
   573 	}
 
   566 }
 
   574 }
 
   567 
   575 
   568 void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget)
 
   576 void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo)
 
   569 {
 
   577 {
 
   570 	game = new HWGame(config, gamecfg, ui.pageSelectWeapon->pWeapons->getWeaponsString(), pTeamSelWidget);
 
   578 	game = new HWGame(config, gamecfg, ammo, pTeamSelWidget);
 
   571 	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
 
   579 	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
 
   572 	connect(game, SIGNAL(GameStats(char, const QString &)), this, SLOT(GameStats(char, const QString &)));
 
   580 	connect(game, SIGNAL(GameStats(char, const QString &)), this, SLOT(GameStats(char, const QString &)));
 
   573 	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
 
   581 	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
 
   574 	connect(game, SIGNAL(HaveRecord(bool, const QByteArray &)), this, SLOT(GetRecord(bool, const QByteArray &)));
 
   582 	connect(game, SIGNAL(HaveRecord(bool, const QByteArray &)), this, SLOT(GetRecord(bool, const QByteArray &)));
 
   575 
   583 
   610 	demofile.close();
 
   618 	demofile.close();
 
   611 }
 
   619 }
 
   612 
   620 
   613 void HWForm::StartTraining()
 
   621 void HWForm::StartTraining()
 
   614 {
 
   622 {
 
   615 	CreateGame(0, 0);
 
   623 	CreateGame(0, 0, 0);
 
   616 
   624 
   617 	game->StartTraining();
 
   625 	game->StartTraining();
 
   618 }
 
   626 }
 
   619 
   627 
   620 void HWForm::CreateNetGame()
 
   628 void HWForm::CreateNetGame()
 
   621 {
 
   629 {
 
   622 	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget);
 
   630 	QString ammo=ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageNetGame->pGameCFG->WeaponsName->currentText());
 
       
   631 	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo);
 
   623 
   632 
   624 	connect(game, SIGNAL(SendNet(const QByteArray &)), hwnet, SLOT(SendNet(const QByteArray &)));
 
   633 	connect(game, SIGNAL(SendNet(const QByteArray &)), hwnet, SLOT(SendNet(const QByteArray &)));
 
   625 	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
 
   634 	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
 
   626 
   635 
   627 	game->StartNet();
 
   636 	game->StartNet();
hedgewars