diff -r 5ec611d702a0 -r 60e4af0a4375 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Sun Jan 21 20:14:49 2007 +0000 +++ b/QTfrontend/netserver.cpp Sun Jan 21 21:27:07 2007 +0000 @@ -90,7 +90,7 @@ return getChiefClient()==cl; } -QMap HWNetServer::getGameCfg() const +QMap HWNetServer::getGameCfg() const { for(QList::const_iterator it=connclients.begin(); it!=connclients.end(); ++it) { if(isChiefClient(*it)) { @@ -98,7 +98,7 @@ } } // error happened if we are here - return QMap(); + return QMap(); } bool HWNetServer::haveNick(const QString& nick) const @@ -209,16 +209,16 @@ if(m_hwserver->isChiefClient(this)) RawSendNet(QString("CONFIGASKED")); else { RawSendNet(QString("SLAVE")); - // send config - QMap conf=m_hwserver->getGameCfg(); - for(QMap::iterator it=conf.begin(); it!=conf.end(); ++it) { - RawSendNet(QString("CONFIG_PARAM")+delimeter+it.key()+delimeter+it.value()); - } // send teams QList team_conf=m_hwserver->getTeamsConfig(); for(QList::iterator tmit=team_conf.begin(); tmit!=team_conf.end(); ++tmit) { RawSendNet(QString("ADDTEAM:")+delimeter+tmit->join(QString(delimeter))); } + // send config + QMap conf=m_hwserver->getGameCfg(); + for(QMap::iterator it=conf.begin(); it!=conf.end(); ++it) { + RawSendNet(QString("CONFIG_PARAM")+delimeter+it.key()+delimeter+it.value().join(QString(delimeter))); + } } return; } @@ -235,7 +235,7 @@ if(lst[0]=="CONFIG_PARAM") { if(!m_hwserver->isChiefClient(this) || lst.size()<3) return; // error or permission denied :) - else m_gameCfg[lst[1]]=lst[2]; + else m_gameCfg[lst[1]]=lst.mid(2); } if(lst[0]=="ADDTEAM:") { @@ -247,6 +247,7 @@ m_teamsCfg.push_back(lst); m_hwserver->sendOthers(this, QString("ADDTEAM:")+delimeter+lst.join(QString(delimeter))); + RawSendNet(QString("TEAM_ACCEPTED%1%2%1%3").arg(delimeter).arg(lst[0]).arg(lst[1])); return; }