Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Address second review

Browse Source
This commit is contained in:
FutureRave 2022-01-19 14:05:40 +00:00
parent 2adad67f4f
commit 2c27de030c
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Components/Modules/Chat.cpp
View File

@ -13,8 +13,6 @@ namespace Components
const char* Chat::EvaluateSay(char* text, Game::gentity_t* player) const char* Chat::EvaluateSay(char* text, Game::gentity_t* player)
{ {
std::lock_guard<std::mutex> _(Chat::AccessMutex);
Chat::SendChat = true; Chat::SendChat = true;
if (text[1] == '/') if (text[1] == '/')
@ -24,13 +22,21 @@ namespace Components
++text; ++text;
} }
std::unique_lock<std::mutex> lock(Chat::AccessMutex);
if (Chat::MuteList.find(Game::svs_clients[player->s.number].steamID) != Chat::MuteList.end()) if (Chat::MuteList.find(Game::svs_clients[player->s.number].steamID) != Chat::MuteList.end())
{ {
lock.unlock();
Chat::SendChat = false; Chat::SendChat = false;
Game::SV_GameSendServerCommand(player->s.number, 0, Game::SV_GameSendServerCommand(player->s.number, 0,
Utils::String::VA("%c \"You are muted\"", 0x65)); Utils::String::VA("%c \"You are muted\"", 0x65));
} }
// Test whether the lock is still locked
if (lock.owns_lock())
{
lock.unlock();
}
TextRenderer::StripMaterialTextIcons(text, text, strlen(text) + 1); TextRenderer::StripMaterialTextIcons(text, text, strlen(text) + 1);
Game::Scr_AddEntity(player); Game::Scr_AddEntity(player);
@ -208,11 +214,12 @@ namespace Components
void Chat::MuteClient(const Game::client_t* client) void Chat::MuteClient(const Game::client_t* client)
{ {
std::lock_guard<std::mutex> _(Chat::AccessMutex); std::unique_lock<std::mutex> lock(Chat::AccessMutex);
if (Chat::MuteList.find(client->steamID) == Chat::MuteList.end()) if (Chat::MuteList.find(client->steamID) == Chat::MuteList.end())
{ {
Chat::MuteList.insert(client->steamID); Chat::MuteList.insert(client->steamID);
lock.unlock();
Logger::Print("%s was muted\n", client->name); Logger::Print("%s was muted\n", client->name);
Game::SV_GameSendServerCommand(client->gentity->s.number, 0, Game::SV_GameSendServerCommand(client->gentity->s.number, 0,
@ -220,6 +227,7 @@ namespace Components
return; return;
} }
lock.unlock();
Logger::Print("%s is already muted\n", client->name); Logger::Print("%s is already muted\n", client->name);
Game::SV_GameSendServerCommand(-1, 0, Game::SV_GameSendServerCommand(-1, 0,
Utils::String::VA("%c \"%s is already muted\"", 0x65, client->name)); Utils::String::VA("%c \"%s is already muted\"", 0x65, client->name));
@ -236,7 +244,7 @@ namespace Components
void Chat::UnmuteInternal(const std::uint64_t id, bool everyone) void Chat::UnmuteInternal(const std::uint64_t id, bool everyone)
{ {
std::lock_guard<std::mutex> _(Chat::AccessMutex); std::unique_lock<std::mutex> lock(Chat::AccessMutex);
if (everyone) if (everyone)
Chat::MuteList.clear(); Chat::MuteList.clear();