diff -r ae6c4f10ace2 -r 7a47a80b20ad QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Fri Oct 10 13:19:05 2008 +0000 +++ b/QTfrontend/hwform.cpp Sun Oct 12 16:31:23 2008 +0000 @@ -258,20 +258,23 @@ void HWForm::OnPageShown(quint8 id, quint8 lastid) { if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETCFG) { - QStringList tmNames=config->GetTeamsList(); + QStringList tmNames = config->GetTeamsList(); TeamSelWidget* curTeamSelWidget; + if(id == ID_PAGE_MULTIPLAYER) { - curTeamSelWidget=ui.pageMultiplayer->teamsSelect; + curTeamSelWidget = ui.pageMultiplayer->teamsSelect; } else { - curTeamSelWidget=ui.pageNetGame->pNetTeamsWidget; + curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; } + QList teamsList; - for(QStringList::iterator it=tmNames.begin(); it!=tmNames.end(); it++) { + for(QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) { HWTeam team(*it); team.LoadFromFile(); teamsList.push_back(team); } - if(lastid==ID_PAGE_SETUP) { // _TEAM + + if(lastid == ID_PAGE_SETUP) { // _TEAM if (editedTeam) { curTeamSelWidget->addTeam(*editedTeam); } @@ -553,7 +556,7 @@ void HWForm::StartMPGame() { - QString ammo=ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageMultiplayer->gameCFG->WeaponsName->currentText()); + QString ammo = ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageMultiplayer->gameCFG->WeaponsName->currentText()); CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);