3 Commits

Author SHA1 Message Date
31920b0692 Some fixes 2021-12-27 21:03:29 +01:00
fed
89e4edc00b Fix 2021-12-14 10:03:59 +01:00
fed
379a21ff7e Small fix 2021-12-13 08:06:24 +01:00
4 changed files with 13 additions and 13 deletions

View File

@ -29,7 +29,7 @@ namespace notifies
const auto entity_id = game::Scr_GetEntityId(clientNum, 0); const auto entity_id = game::Scr_GetEntityId(clientNum, 0);
const auto result = callback(entity_id, {message, cmd == "say_team"s}); const auto result = callback(entity_id, {message, cmd == "say_team"s});
if (result.is<int>()) if (result.is<int>() && !hidden)
{ {
hidden = result.as<int>() == 0; hidden = result.as<int>() == 0;
} }

View File

@ -85,7 +85,6 @@ namespace scripting
callback(); callback();
} }
shutdown_callbacks = {};
g_shutdown_game_hook.invoke<void>(free_scripts); g_shutdown_game_hook.invoke<void>(free_scripts);
} }

View File

@ -13,12 +13,17 @@ namespace userinfo
{ {
utils::hook::detour sv_getuserinfo_hook; utils::hook::detour sv_getuserinfo_hook;
userinfo_map userinfo_to_map(const std::string& userinfo) userinfo_map userinfo_to_map(std::string userinfo)
{ {
userinfo_map map; userinfo_map map{};
const auto args = utils::string::split(userinfo, '\\');
for (auto i = 1; i < args.size() - 1; i += 2) if (userinfo[0] == '\\')
{
userinfo = userinfo.substr(1);
}
const auto args = utils::string::split(userinfo, '\\');
for (size_t i = 0; !args.empty() && i < (args.size() - 1); i += 2)
{ {
map[args[i]] = args[i + 1]; map[args[i]] = args[i + 1];
} }
@ -28,7 +33,7 @@ namespace userinfo
std::string map_to_userinfo(const userinfo_map& map) std::string map_to_userinfo(const userinfo_map& map)
{ {
std::string buffer; std::string buffer{};
for (const auto& value : map) for (const auto& value : map)
{ {
@ -43,9 +48,8 @@ namespace userinfo
void sv_getuserinfo_stub(int index, char* buffer, int bufferSize) void sv_getuserinfo_stub(int index, char* buffer, int bufferSize)
{ {
char _buffer[1024]; sv_getuserinfo_hook.invoke<void>(index, buffer, bufferSize);
sv_getuserinfo_hook.invoke<void>(index, _buffer, 1024); auto map = userinfo_to_map(buffer);
auto map = userinfo_to_map(_buffer);
if (userinfo_overrides.find(index) == userinfo_overrides.end()) if (userinfo_overrides.find(index) == userinfo_overrides.end())
{ {

View File

@ -60,13 +60,11 @@ namespace scripting
array::array() array::array()
{ {
this->id_ = make_array(); this->id_ = make_array();
this->add();
} }
array::array(std::vector<script_value> values) array::array(std::vector<script_value> values)
{ {
this->id_ = make_array(); this->id_ = make_array();
this->add();
for (const auto& value : values) for (const auto& value : values)
{ {
@ -77,7 +75,6 @@ namespace scripting
array::array(std::unordered_map<std::string, script_value> values) array::array(std::unordered_map<std::string, script_value> values)
{ {
this->id_ = make_array(); this->id_ = make_array();
this->add();
for (const auto& value : values) for (const auto& value : values)
{ {