Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
Maurice Heumann 2023-03-21 19:19:01 +01:00
parent 3e0099deda
commit 9afeee582d
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/component/chat.cpp
View File

@ -53,7 +53,7 @@ namespace chat
} }
} }
const char* GetClientName(const uint64_t xuid) const char* get_client_name(const uint64_t xuid)
{ {
if (xuid < 19 && !game::is_server()) if (xuid < 19 && !game::is_server())
{ {

2
src/client/component/chat.hpp
View File

@ -2,5 +2,5 @@
namespace chat namespace chat
{ {
const char* GetClientName(const uint64_t xuid); const char* get_client_name(const uint64_t xuid);
} }

28
src/client/component/script.cpp
View File

@ -13,16 +13,12 @@ namespace script
namespace namespace
{ {
utils::hook::detour db_findxassetheader_hook; utils::hook::detour db_findxassetheader_hook;
struct globals_t
{
std::unordered_map<std::string, game::RawFile*> loaded_scripts; std::unordered_map<std::string, game::RawFile*> loaded_scripts;
} globals;
game::RawFile* get_loaded_script(const std::string& name) game::RawFile* get_loaded_script(const std::string& name)
{ {
const auto itr = globals.loaded_scripts.find(name); const auto itr = loaded_scripts.find(name);
return (itr == globals.loaded_scripts.end()) ? nullptr : itr->second; return (itr == loaded_scripts.end()) ? nullptr : itr->second;
} }
void print_loading_script(const std::string& name) void print_loading_script(const std::string& name)
@ -55,7 +51,7 @@ namespace script
rawfile->buffer = file_string; rawfile->buffer = file_string;
rawfile->len = static_cast<int>(data.length()); rawfile->len = static_cast<int>(data.length());
globals.loaded_scripts[name] = rawfile; loaded_scripts[name] = rawfile;
} }
void load_scripts_folder(const std::string& script_dir) void load_scripts_folder(const std::string& script_dir)
@ -85,7 +81,7 @@ namespace script
void load_scripts() void load_scripts()
{ {
globals = {}; loaded_scripts = {};
const utils::nt::library host{}; const utils::nt::library host{};
load_scripts_folder((game::get_appdata_path() / "data/scripts").string()); load_scripts_folder((game::get_appdata_path() / "data/scripts").string());
load_scripts_folder((host.get_folder() / "boiii/scripts").string()); load_scripts_folder((host.get_folder() / "boiii/scripts").string());
@ -95,17 +91,17 @@ namespace script
const bool error_if_missing, const bool error_if_missing,
const int wait_time) const int wait_time)
{ {
if (type != game::ASSET_TYPE_SCRIPTPARSETREE)
{
return db_findxassetheader_hook.invoke<game::RawFile*>(type, name, error_if_missing, wait_time);
}
auto* asset_header = db_findxassetheader_hook.invoke<game::RawFile*>( auto* asset_header = db_findxassetheader_hook.invoke<game::RawFile*>(
type, name, error_if_missing, wait_time); type, name, error_if_missing, wait_time);
if (globals.loaded_scripts.contains(name))
{
auto* script = get_loaded_script(name);
if (type != game::ASSET_TYPE_SCRIPTPARSETREE)
{
return asset_header;
}
auto* script = get_loaded_script(name);
if (script)
{
// Copy over the checksum of the original script // Copy over the checksum of the original script
utils::hook::copy(const_cast<char*>(script->buffer + 0x8), asset_header->buffer + 0x8, 4); utils::hook::copy(const_cast<char*>(script->buffer + 0x8), asset_header->buffer + 0x8, 4);

2
src/client/steam/interfaces/friends.cpp
View File

@ -45,7 +45,7 @@ namespace steam
const char* friends::GetFriendPersonaName(steam_id steamIDFriend) const char* friends::GetFriendPersonaName(steam_id steamIDFriend)
{ {
return chat::GetClientName(steamIDFriend.bits); return chat::get_client_name(steamIDFriend.bits);
} }
bool friends::GetFriendGamePlayed(steam_id steamIDFriend, void* pFriendGameInfo) bool friends::GetFriendGamePlayed(steam_id steamIDFriend, void* pFriendGameInfo)