# HG changeset patch # User Wuzzy # Date 1538526519 -7200 # Node ID d012948b1eda59cb29a7cce7e1d9f8a242a7e730 # Parent b56639b52e5963662439a1a89f2174cb75065f2f Make frontend forward server error and warning messages to engine diff -r b56639b52e59 -r d012948b1eda QTfrontend/game.cpp --- a/QTfrontend/game.cpp Tue Oct 02 22:11:15 2018 +0200 +++ b/QTfrontend/game.cpp Wed Oct 03 02:28:39 2018 +0200 @@ -346,6 +346,20 @@ RawSendIPC(buf); } +void HWGame::FromNetWarning(const QString & msg) +{ + QByteArray buf; + HWProto::addStringToBuffer(buf, "s\x00" + msg + "\x20\x20"); + RawSendIPC(buf); +} + +void HWGame::FromNetError(const QString & msg) +{ + QByteArray buf; + HWProto::addStringToBuffer(buf, "s\x05" + msg + "\x20\x20"); + RawSendIPC(buf); +} + void HWGame::onClientRead() { quint8 msglen; diff -r b56639b52e59 -r d012948b1eda QTfrontend/game.h --- a/QTfrontend/game.h Tue Oct 02 22:11:15 2018 +0200 +++ b/QTfrontend/game.h Wed Oct 03 02:28:39 2018 +0200 @@ -105,6 +105,8 @@ public slots: void FromNet(const QByteArray & msg); void FromNetChat(const QString & msg); + void FromNetWarning(const QString & msg); + void FromNetError(const QString & msg); private: char msgbuf[MAXMSGCHARS]; diff -r b56639b52e59 -r d012948b1eda QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Tue Oct 02 22:11:15 2018 +0200 +++ b/QTfrontend/hwform.cpp Wed Oct 03 02:28:39 2018 +0200 @@ -1873,6 +1873,8 @@ connect(game, SIGNAL(SendConsoleCommand(const QString&)), hwnet, SLOT(consoleCommand(const QString&))); connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &))); connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)), Qt::QueuedConnection); + connect(hwnet, SIGNAL(Warning(const QString&)), game, SLOT(FromNetWarning(const QString&)), Qt::QueuedConnection); + connect(hwnet, SIGNAL(Error(const QString&)), game, SLOT(FromNetError(const QString&)), Qt::QueuedConnection); game->StartNet(); }