ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Toxic features and improve protections (#897)

Browse Source
This commit is contained in:
maybegreat48
2023-01-22 21:57:32 +00:00
committed by GitHub
parent f360d7f436
commit d45d0c1ffc
59 changed files with 8056 additions and 6801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/services/gta_data/gta_data_service.cpp
View File

@ -23,7 +23,7 @@ namespace big
gta_data_service::gta_data_service() :
m_peds_cache(g_file_manager->get_project_file("./cache/peds.bin"), 1),
m_vehicles_cache(g_file_manager->get_project_file("./cache/vehicles.bin"), 1),
m_weapons_cache(g_file_manager->get_project_file("./cache/weapons.bin"), 1),
m_weapons_cache(g_file_manager->get_project_file("./cache/weapons.bin"), 2),
m_update_state(eGtaDataUpdateState::IDLE)
{
if (!is_cache_up_to_date())
@ -194,6 +194,33 @@ namespace big
m_weapons_cache.free();
}
inline void parse_ped(std::vector<ped_item>& peds, std::vector<std::uint32_t>& mapped_peds, pugi::xml_document& doc)
{
const auto& items = doc.select_nodes("/CPedModelInfo__InitDataList/InitDatas/Item");
for (const auto& item_node : items)
{
const auto& item = item_node.node();
const auto name = item.child("Name").text().as_string();
const auto hash = rage::joaat(name);
if (std::find(mapped_peds.begin(), mapped_peds.end(), hash) != mapped_peds.end())
continue;
mapped_peds.emplace_back(hash);
auto ped = ped_item{};
std::strncpy(ped.m_name, name, sizeof(ped.m_name));
const auto ped_type = item.child("Pedtype").text().as_string();
std::strncpy(ped.m_ped_type, ped_type, sizeof(ped.m_ped_type));
ped.m_hash = hash;
peds.emplace_back(std::move(ped));
}
}
void gta_data_service::rebuild_cache()
{
m_update_state = eGtaDataUpdateState::UPDATING;
@ -287,12 +314,15 @@ namespace big
const auto name = item.child("Name").text().as_string();
const auto hash = rage::joaat(name);
if (hash == RAGE_JOAAT("WEAPON_BIRD_CRAP"))
continue;
if (exists(mapped_weapons, hash))
continue;
mapped_weapons.emplace_back(hash);
const auto human_name_hash = item.child("HumanNameHash").text().as_string();
if (std::strcmp(human_name_hash, "WT_INVALID") == 0)
if (std::strcmp(human_name_hash, "WT_INVALID") == 0 || std::strcmp(human_name_hash, "WT_VEHMINE") == 0)
continue;
auto weapon = weapon_item{};
@ -309,8 +339,11 @@ namespace big
bool is_gun = false;
bool is_rechargable = false;
const char* category = "";
std::size_t pos;
while ((pos = weapon_flags.find(' ')) != std::string::npos) {
while ((pos = weapon_flags.find(' ')) != std::string::npos)
{
const auto flag = weapon_flags.substr(0, pos);
if (flag == "Thrown")
{
@ -324,11 +357,19 @@ namespace big
{
is_rechargable = true;
}
else if (flag == "Vehicle" || flag == "HiddenFromWeaponWheel" || flag == "NotAWeapon")
{
goto skip;
}
weapon_flags.erase(0, pos + 1);
}
const auto category = item.child("Group").text().as_string();
category = item.child("Group").text().as_string();
if (std::strlen(category) == 0 || std::strcmp(category, "GROUP_DIGISCANNER") == 0)
continue;
if (std::strlen(category) > 6)
{
std::strncpy(weapon.m_weapon_type, category + 6, sizeof(weapon.m_weapon_type));
@ -349,35 +390,16 @@ namespace big
weapon.m_hash = hash;
weapons.emplace_back(std::move(weapon));
skip:
continue;
}
});
}
else if (file.filename() == "peds.meta" || file.filename() == "peds.ymt")
else if (file.filename() == "peds.meta")
{
rpf_wrapper.read_xml_file(file, [&exists, &peds, &mapped_peds](pugi::xml_document& doc)
{
const auto& items = doc.select_nodes("/CPedModelInfo__InitDataList/InitDatas/Item");
for (const auto& item_node : items)
{
const auto& item = item_node.node();
const auto name = item.child("Name").text().as_string();
const auto hash = rage::joaat(name);
if (exists(mapped_peds, hash))
continue;
mapped_peds.emplace_back(hash);
auto ped = ped_item{};
std::strncpy(ped.m_name, name, sizeof(ped.m_name));
const auto ped_type = item.child("Pedtype").text().as_string();
std::strncpy(ped.m_ped_type, ped_type, sizeof(ped.m_ped_type));
ped.m_hash = hash;
peds.emplace_back(std::move(ped));
}
parse_ped(peds, mapped_peds, doc);
});
}
}

2
src/services/gui/gui_service.hpp
View File

@ -32,6 +32,7 @@ namespace big
NETWORK,
SESSION,
MISSIONS,
SPOOFING,
PLAYER_DATABASE,
SESSION_BROWSER,
@ -87,6 +88,7 @@ namespace big
{tabs::NETWORK, { "Network", nullptr, {
{ tabs::SPOOFING, { "Spoofing", view::spoofing }},
{ tabs::SESSION, { "Session", view::session }},
{ tabs::MISSIONS, { "Missions", view::missions }},
{ tabs::PLAYER_DATABASE, { "Player Database", view::player_database }},
{ tabs::SESSION_BROWSER, { "Session Browser", view::session_browser }},
}}},

4
src/services/hotkey/hotkey_service.cpp
View File

@ -5,6 +5,7 @@
#include "network/ChatData.hpp"
#include "pointers.hpp"
#include "gui.hpp"
namespace big
{
@ -70,6 +71,9 @@ namespace big
if (const auto chat_data = *g_pointers->m_chat_data; chat_data && (chat_data->m_chat_open || chat_data->m_timer_two))
return;
if (g_gui->is_open())
return;
if (state == eKeyState::RELEASE || state == eKeyState::DOWN)
{
auto &hotkey_map = m_hotkeys[state == eKeyState::RELEASE];

3
src/services/players/player.hpp
View File

@ -66,6 +66,9 @@ namespace big
rate_limiter m_host_migration_rate_limit{ 1s, 20 };
rate_limiter m_play_sound_rate_limit{ 1s, 10 };
rate_limiter m_invites_rate_limit{ 10s, 2 };
int m_num_spawned_permanent_vehicles = 0;
bool m_block_permanent_vehicles = false;
bool exposed_desync_protection = false;
bool is_modder = false;