# HG changeset patch # User unc0rr # Date 1223224706 0 # Node ID f90bf22766390d72e700a9d275f70183d8b14bbc # Parent 4290ba4a14ca128c56903cb2c3cc6800882e9d0c Don't allow team with the same name from the same client (helps with double add due to lags) diff -r 4290ba4a14ca -r f90bf2276639 QTfrontend/netconnectedclient.cpp --- a/QTfrontend/netconnectedclient.cpp Sun Oct 05 16:35:46 2008 +0000 +++ b/QTfrontend/netconnectedclient.cpp Sun Oct 05 16:38:26 2008 +0000 @@ -212,20 +212,25 @@ return; } - for(QMap::iterator it=m_hwserver->m_gameCfg.begin(); it!=m_hwserver->m_gameCfg.end(); ++it) - { - QStringList hhTmpList=it.key().split('+'); - if(hhTmpList[0] == "HHNUM") - { - if(hhTmpList[1]==lst[1]) - { - m_hwserver->hhnum-=it.value()[0].toUInt(); - m_hwserver->m_gameCfg.remove(it.key()); -qDebug() << "REMOVETEAM hhnum = " << m_hwserver->hhnum; - break; - } - } - } + for(QMap::iterator it=m_hwserver->m_gameCfg.begin(); it!=m_hwserver->m_gameCfg.end(); ++it) + { + QStringList hhTmpList=it.key().split('+'); + if(hhTmpList[0] == "HHNUM") + { + if(hhTmpList[1]==lst[1]) + { + m_hwserver->hhnum-=it.value()[0].toUInt(); + m_hwserver->m_gameCfg.remove(it.key()); + + for(QList::iterator it=m_teamsCfg.begin(); it!=m_teamsCfg.end(); ++it) + if((*it)[0] == lst[1]) + m_teamsCfg.erase(it); + + qDebug() << "REMOVETEAM hhnum = " << m_hwserver->hhnum; + break; + } + } + } unsigned int netID=removeTeam(lst[1]); m_hwserver->sendOthers(this, QString("REMOVETEAM:")+delimeter+lst[1]+delimeter+QString::number(netID)); @@ -237,8 +242,6 @@ unsigned int HWConnectedClient::netIDbyTeamName(const QString& tname) { - qDebug() << "Check exist" << tname; - for(QList::iterator it=m_teamsCfg.begin(); it!=m_teamsCfg.end(); ++it) if((*it)[0]==tname) return (*it)[1].toUInt();