# HG changeset patch # User unc0rr # Date 1224089951 0 # Node ID d3e285281c2644efddffafc2a7d5977a4778485a # Parent c7703c653865d00be93e0cb278026323b876f69e Fix doubling chat message diff -r c7703c653865 -r d3e285281c26 QTfrontend/chatwidget.cpp --- a/QTfrontend/chatwidget.cpp Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/chatwidget.cpp Wed Oct 15 16:59:11 2008 +0000 @@ -55,7 +55,7 @@ chatEditLine->clear(); } -void HWChatWidget::onChatStringFromNet(const QString& str) +void HWChatWidget::onChatString(const QString& str) { QListWidget* w = chatText; w->addItem(str); diff -r c7703c653865 -r d3e285281c26 QTfrontend/chatwidget.h --- a/QTfrontend/chatwidget.h Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/chatwidget.h Wed Oct 15 16:59:11 2008 +0000 @@ -34,7 +34,7 @@ HWChatWidget(QWidget* parent=0); public slots: - void onChatStringFromNet(const QString& str); + void onChatString(const QString& str); void nickAdded(const QString& nick); void nickRemoved(const QString& nick); void clear(); diff -r c7703c653865 -r d3e285281c26 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/hwform.cpp Wed Oct 15 16:59:11 2008 +0000 @@ -431,7 +431,9 @@ hwnet, SLOT(askRoomsList())); connect(hwnet, SIGNAL(chatStringFromNet(const QString&)), - ui.pageNetGame->pChatWidget, SLOT(onChatStringFromNet(const QString&))); + ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&))); + connect(hwnet, SIGNAL(chatStringFromMet(const QString&)), + ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&))); connect(ui.pageNetGame->pChatWidget, SIGNAL(chatLine(const QString&)), hwnet, SLOT(chatLineToNet(const QString&))); connect(hwnet, SIGNAL(nickAdded(const QString&)), diff -r c7703c653865 -r d3e285281c26 QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/newnetclient.cpp Wed Oct 15 16:59:11 2008 +0000 @@ -482,7 +482,7 @@ { if(str!="") { RawSendNet(QString("CHAT_STRING")+delimeter+str); - emit(chatStringFromNet(QString("%1: %2").arg(mynick).arg(str))); + emit(chatStringFromMe(QString("%1: %2").arg(mynick).arg(str))); } } diff -r c7703c653865 -r d3e285281c26 QTfrontend/newnetclient.h --- a/QTfrontend/newnetclient.h Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/newnetclient.h Wed Oct 15 16:59:11 2008 +0000 @@ -105,6 +105,7 @@ void hhnumChanged(const HWTeam&); void teamColorChanged(const HWTeam&); void chatStringFromNet(const QString&); + void chatStringFromMe(const QString&); void ammoChanged(const QString& name, const QString& ammo); void roomsList(const QStringList&); diff -r c7703c653865 -r d3e285281c26 QTfrontend/proto.cpp --- a/QTfrontend/proto.cpp Wed Oct 15 16:54:05 2008 +0000 +++ b/QTfrontend/proto.cpp Wed Oct 15 16:59:11 2008 +0000 @@ -26,6 +26,7 @@ QByteArray & HWProto::addStringToBuffer(QByteArray & buf, const QString & string) { QByteArray strmsg = string.toUtf8(); + strmsg.left(250); quint8 sz = strmsg.size(); buf.append(QByteArray((char *)&sz, 1)); buf.append(strmsg);