XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

fix(notifes): fix logic with hidden messages

Browse Source
This commit is contained in:
FutureRave 2022-11-02 00:07:37 +00:00
parent d54fa1a80a
commit 2e61c30ef4
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/client/component/notifies.cpp
View File

@ -6,12 +6,13 @@
#include "game/scripting/lua/value_conversion.hpp"
#include "game/scripting/lua/error.hpp"
#include <utils/hook.hpp>
#include "command.hpp"
#include "scheduler.hpp"
#include "notifies.hpp"
#include "scripting.hpp"
#include <utils/hook.hpp>
namespace notifies
{
bool hook_enabled = true;
@ -154,31 +155,44 @@ namespace notifies
void client_command_stub(const int client_num)
{
auto self = &game::mp::g_entities[client_num];
if (!self->client)
if (game::mp::g_entities[client_num].client == nullptr)
{
return;
}
char cmd[1024]{};
game::SV_Cmd_ArgvBuffer(0, cmd, sizeof(cmd));
command::params_sv params;
if (cmd == "say"s || cmd == "say_team"s)
if (params[0] == "say"s || params[0] == "say_team"s)
{
auto hidden = false;
std::string message(game::ConcatArgs(1));
hidden = message[1] == '/';
message.erase(0, hidden ? 2 : 1);
auto msg_index = 0;
if (message[msg_index] == '\x15')
{
msg_index = 1;
}
scheduler::once([cmd, message, self]()
auto hidden = false;
if (message[msg_index] == '/')
{
hidden = true;
if (msg_index == 1)
{
// Overwrite / with \x15 only if present
message[msg_index] = message[msg_index - 1];
}
// Skip over the first character
message.erase(message.begin());
}
scheduler::once([params, message, client_num]
{
const scripting::entity level{*game::levelEntityId};
const auto player = scripting::call("getEntByNum", {self->s.number}).as<scripting::entity>();
const auto player = scripting::call("getEntByNum", {client_num}).as<scripting::entity>();
scripting::notify(level, cmd, {player, message});
scripting::notify(player, cmd, {message});
scripting::notify(level, params[0], {player, message});
scripting::notify(player, params[0], {message});
}, scheduler::pipeline::server);
if (hidden)