games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Partially unified handling of pregame and in-game chats

Browse Source
This commit is contained in:
Ivan Savenko
2024-03-18 19:52:53 +02:00
parent 0b89d3804c
commit 4ed961fb96
14 changed files with 248 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/NetPacksClient.cpp
View File

@@ -22,6 +22,7 @@
#include "gui/WindowHandler.h"
#include "widgets/MiscWidgets.h"
#include "CMT.h"
#include "GameChatHandler.h"
#include "CServerHandler.h"
#include "../CCallback.h"
@@ -881,12 +882,10 @@ void ApplyClientNetPackVisitor::visitPackageApplied(PackageApplied & pack)
void ApplyClientNetPackVisitor::visitSystemMessage(SystemMessage & pack)
{
std::ostringstream str;
str << "System message: " << pack.text;
// usually used to receive error messages from server
logNetwork->error("System message: %s", pack.text);
logNetwork->error(str.str()); // usually used to receive error messages from server
if(LOCPLINT && !settings["session"]["hideSystemMessages"].Bool())
LOCPLINT->cingconsole->print(str.str());
CSH->getGameChat().onNewSystemMessageReceived(pack.text);
}
void ApplyClientNetPackVisitor::visitPlayerBlocked(PlayerBlocked & pack)
@@ -918,13 +917,7 @@ void ApplyClientNetPackVisitor::visitPlayerMessageClient(PlayerMessageClient & p
{
logNetwork->debug("pack.player %s sends a message: %s", pack.player.toString(), pack.text);
std::ostringstream str;
if(pack.player.isSpectator())
str << "Spectator: " << pack.text;
else
str << cl.getPlayerState(pack.player)->nodeName() <<": " << pack.text;
if(LOCPLINT)
LOCPLINT->cingconsole->print(str.str());
CSH->getGameChat().onNewGameMessageReceived(pack.player, pack.text);
}
void ApplyClientNetPackVisitor::visitAdvmapSpellCast(AdvmapSpellCast & pack)