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

Merge pull request #510 from XLabsProject/develop

Browse Source 
Release v2.0.9
This commit is contained in:
Maurice Heumann 2022-11-02 06:41:45 +01:00 committed by GitHub
commit 5e85f595d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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;
@ -79,7 +80,7 @@ namespace notifies
const int means_of_death, const unsigned int weapon, const bool is_alternate, const float* v_dir, const unsigned int hit_loc, int ps_time_offset, int death_anim_duration)
{
{
const std::string _hit_loc = reinterpret_cast<const char**>(0x1409E62B0)[hit_loc];
const std::string _hit_loc = reinterpret_cast<const char**>(0x1409B5400)[hit_loc];
const auto _mod = convert_mod(means_of_death);
const auto _weapon = get_weapon_name(weapon, is_alternate);
@ -117,7 +118,7 @@ namespace notifies
const int means_of_death, const unsigned int weapon, const bool is_alternate, const float* v_point, const float* v_dir, const unsigned int hit_loc, const int time_offset)
{
{
const std::string _hit_loc = reinterpret_cast<const char**>(0x1409E62B0)[hit_loc];
const std::string _hit_loc = reinterpret_cast<const char**>(0x1409B5400)[hit_loc];
const auto _mod = convert_mod(means_of_death);
const auto _weapon = get_weapon_name(weapon, is_alternate);
@ -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)

6
src/client/game/scripting/lua/engine.cpp
View File

@ -53,9 +53,9 @@ namespace scripting::lua::engine
}
stop();
load_scripts(game_module::get_host_module().get_folder() + "/data/scripts/");
load_scripts("s1x/scripts/");
load_scripts("data/scripts/");
load_scripts(game_module::get_host_module().get_folder() + "/data/lua-scripts/");
load_scripts("s1x/lua-scripts/");
load_scripts("data/lua-scripts/");
}
void notify(const event& e)