# HG changeset patch # User unc0rr # Date 1216140050 0 # Node ID 5be338fa4e2c8f13228aba8939683ce58d97e971 # Parent 8735046fc6987577939a65a1b2101ff7153fb1af First steps to switch hedgewars to new net protocol diff -r 8735046fc698 -r 5be338fa4e2c QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Mon Jul 14 20:24:29 2008 +0000 +++ b/QTfrontend/newnetclient.cpp Tue Jul 15 16:40:50 2008 +0000 @@ -56,7 +56,7 @@ void HWNewNet::JoinGame(const QString & game) { - RawSendNet(QString("JOIN %1").arg(game)); + RawSendNet(QString("JOIN%1%2").arg(delimeter).arg(game)); } void HWNewNet::AddTeam(const HWTeam & team) @@ -98,6 +98,7 @@ void HWNewNet::RawSendNet(const QByteArray & buf) { +qDebug() << "Client: " << buf; NetSocket.write(buf); NetSocket.write("\n", 1); } @@ -142,6 +143,7 @@ void HWNewNet::ParseLine(const QByteArray & line) { +qDebug() << "Server: " << line; QString msg = QString::fromUtf8 (line.data(), line.size()); QStringList lst = msg.split(delimeter); diff -r 8735046fc698 -r 5be338fa4e2c netserver/newhwserv.hs --- a/netserver/newhwserv.hs Mon Jul 14 20:24:29 2008 +0000 +++ b/netserver/newhwserv.hs Tue Jul 15 16:40:50 2008 +0000 @@ -17,6 +17,7 @@ cChan <- atomically newTChan forkIO $ clientLoop cHandle cChan atomically $ writeTChan acceptChan (ClientInfo cChan cHandle "" 0 "" False) + hPutStrLn cHandle "CONNECTED" acceptLoop servSock acceptChan listenLoop :: Handle -> TChan String -> IO ()