diff -r bf91f935feff -r 9d43a6e6b9ca QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Thu Oct 09 13:01:52 2008 +0000 +++ b/QTfrontend/newnetclient.cpp Thu Oct 09 13:43:47 2008 +0000 @@ -87,7 +87,7 @@ void HWNewNet::AddTeam(const HWTeam & team) { - QString cmd = QString("ADDTEAM") + delimeter + + QString cmd = QString("ADD_TEAM") + delimeter + team.TeamName + delimeter + team.teamColor.name() + delimeter + team.Grave + delimeter + @@ -345,23 +345,28 @@ emit ammoChanged(lst[3], lst[2]); return; } - QStringList hhTmpList = lst[1].split('+');// deprecated stuff +/* QStringList hhTmpList = lst[1].split('+');// deprecated stuff if (hhTmpList[0] == "TEAM_COLOR") { HWTeam tmptm(hhTmpList[1]); tmptm.teamColor = QColor(lst[2]); emit teamColorChanged(tmptm); return; - } - if (hhTmpList[0] == "HHNUM") { - HWTeam tmptm(hhTmpList[1]); - tmptm.numHedgehogs = lst[2].toUInt(); - emit hhnumChanged(tmptm); - return; - } + }*/ qWarning() << "Net: Unknown 'CONFIG_PARAM' message:" << lst; return; } + if (lst[0] == "HH_NUM") { + if (lst.size() != 3) + { + qWarning("Net: Bad TEAM_ACCEPTED message"); + return; + } + HWTeam tmptm(lst[1]); + tmptm.numHedgehogs = lst[2].toUInt(); + emit hhnumChanged(tmptm); + return; + } if (lst[0] == "GAMEMSG") { if(lst.size() < 2) @@ -400,7 +405,7 @@ void HWNewNet::onHedgehogsNumChanged(const HWTeam& team) { - RawSendNet(QString("HHNUM%1%2%1%3") + RawSendNet(QString("HH_NUM%1%2%1%3") .arg(delimeter) .arg(team.TeamName) .arg(team.numHedgehogs));