# HG changeset patch # User displacer # Date 1170803908 0 # Node ID 64a62b679b04bb6df7d7a428c41df82faaccd651 # Parent 282b00e559bdaddbf47c59501cd1d8ce5510c297 final bugfixes :) diff -r 282b00e559bd -r 64a62b679b04 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Tue Feb 06 23:12:24 2007 +0000 +++ b/QTfrontend/netserver.cpp Tue Feb 06 23:18:28 2007 +0000 @@ -98,6 +98,8 @@ QMap HWNetServer::getGameCfg() const { + return m_gameCfg; + /* for(QList::const_iterator it=connclients.begin(); it!=connclients.end(); ++it) { if(isChiefClient(*it)) { return (*it)->m_gameCfg; @@ -105,6 +107,7 @@ } // error happened if we are here return QMap(); + */ } bool HWNetServer::haveNick(const QString& nick) const @@ -250,7 +253,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.mid(2); + else m_hwserver->m_gameCfg[lst[1]]=lst.mid(2); qDebug() << msg; } @@ -278,12 +281,13 @@ .arg(lst.takeAt(2)); qDebug() << "color config:" << colorCfg; - m_gameCfg[colorCfg.split(delimeter)[1]]=colorCfg.split(delimeter).mid(2); - m_gameCfg[hhnumCfg.split(delimeter)[1]]=hhnumCfg.split(delimeter).mid(2); + m_hwserver->m_gameCfg[colorCfg.split(delimeter)[1]]=colorCfg.split(delimeter).mid(2); + m_hwserver->m_gameCfg[hhnumCfg.split(delimeter)[1]]=hhnumCfg.split(delimeter).mid(2); 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])); + m_hwserver->sendAll(colorCfg); m_hwserver->sendAll(hhnumCfg); return; } @@ -291,7 +295,7 @@ if(lst[0]=="REMOVETEAM:") { if(lst.size()<2) return; - for(QMap::iterator it=m_gameCfg.begin(); it!=m_gameCfg.end(); ++it) { + 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") { qDebug() << "hhnum config found"; diff -r 282b00e559bd -r 64a62b679b04 QTfrontend/netserver.h --- a/QTfrontend/netserver.h Tue Feb 06 23:12:24 2007 +0000 +++ b/QTfrontend/netserver.h Tue Feb 06 23:18:28 2007 +0000 @@ -47,7 +47,6 @@ QString getHedgehogsDescription() const; bool readyToStart; - QMap m_gameCfg; // config_param - value QList m_teamsCfg; // TeamName - hhs class ShouldDisconnectException {}; @@ -91,6 +90,7 @@ QString prepareConfig(QStringList lst); void resetStart(); + QMap m_gameCfg; // config_param - value int hhnum; private: