equal
deleted
inserted
replaced
17 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
17 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
18 */ |
18 */ |
19 |
19 |
20 #include <QMessageBox> |
20 #include <QMessageBox> |
21 #include <QDebug> |
21 #include <QDebug> |
|
22 #include <QTextDocument> |
22 |
23 |
23 #include "hwconsts.h" |
24 #include "hwconsts.h" |
24 #include "newnetclient.h" |
25 #include "newnetclient.h" |
25 #include "proto.h" |
26 #include "proto.h" |
26 #include "gameuiconfig.h" |
27 #include "gameuiconfig.h" |
276 return; |
277 return; |
277 } |
278 } |
278 QStringList tmp = lst; |
279 QStringList tmp = lst; |
279 tmp.removeFirst(); |
280 tmp.removeFirst(); |
280 if (netClientState == 2) |
281 if (netClientState == 2) |
281 emit chatStringLobby(tmp.join("\n")); |
282 emit chatStringLobby(Qt::escape(tmp.join("\n"))); |
282 else |
283 else |
283 emit chatStringFromNet(tmp.join("\n")); |
284 emit chatStringFromNet(Qt::escape(tmp.join("\n"))); |
284 return; |
285 return; |
285 } |
286 } |
286 |
287 |
287 if (lst[0] == "READY") { |
288 if (lst[0] == "READY") { |
288 if(lst.size() != 2) |
289 if(lst.size() != 2) |
645 } |
646 } |
646 |
647 |
647 QString HWNewNet::formatChatMsg(const QString & nick, const QString & msg) |
648 QString HWNewNet::formatChatMsg(const QString & nick, const QString & msg) |
648 { |
649 { |
649 if(msg.left(4) == "/me ") |
650 if(msg.left(4) == "/me ") |
650 return QString("* %1 %2").arg(nick).arg(msg.mid(4)); |
651 return QString("* %1 %2").arg(Qt::escape(nick)).arg(Qt::escape(msg.mid(4))); |
651 else |
652 else |
652 return QString("%1: %2").arg(nick).arg(msg); |
653 return QString("%1: %2").arg(Qt::escape(nick)).arg(Qt::escape(msg)); |
653 } |
654 } |
654 |
655 |
655 void HWNewNet::kickPlayer(const QString & nick) |
656 void HWNewNet::kickPlayer(const QString & nick) |
656 { |
657 { |
657 RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick)); |
658 RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick)); |