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

Merge pull request #592 from Brentdevent/mods

Browse Source 
Make usercontent zone folder toggleable
This commit is contained in:
Maurice Heumann 2023-04-25 07:49:03 +02:00 committed by GitHub
commit 7a38919c51
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/client/component/workshop.cpp
View File

@ -3,6 +3,8 @@
#include "workshop.hpp"
#include "game/game.hpp"
#include "game/utils.hpp"
#include "command.hpp"
#include <utils/hook.hpp>
#include <utils/string.hpp>
@ -12,6 +14,8 @@ namespace workshop
{
namespace
{
const game::dvar_t* enable_zone_folder;
utils::hook::detour setup_server_map_hook;
utils::hook::detour load_usermap_hook;
@ -141,6 +145,60 @@ namespace workshop
return utils::hook::invoke<bool>(0x1420D6380_g, type, pub_id.data(), a3);
}
void override_path_mods_stub(utils::hook::assembler& a)
{
const auto new_path = a.newLabel();
const auto default_path = a.newLabel();
const auto original_func = a.newLabel();
a.pushad64();
a.mov(rax, qword_ptr(reinterpret_cast<std::uintptr_t>(&enable_zone_folder)));
a.test(rax, rax);
a.jz(new_path);
a.cmp(byte_ptr(rax, 0x28), 0);
a.je(new_path);
a.bind(default_path);
a.popad64();
a.mov(rcx, "%s/%s/%s/zone");
a.jmp(original_func);
a.bind(new_path);
a.popad64();
a.mov(rcx, "%s/%s/%s");
a.bind(original_func);
a.jmp(game::select(0x1420D6AA0, 0x1404E2930));
}
void override_path_usercontent_stub(utils::hook::assembler& a)
{
const auto new_path = a.newLabel();
const auto default_path = a.newLabel();
const auto original_func = a.newLabel();
a.pushad64();
a.mov(rax, qword_ptr(reinterpret_cast<std::uintptr_t>(&enable_zone_folder)));
a.test(rax, rax);
a.jz(new_path);
a.cmp(byte_ptr(rax, 0x28), 0);
a.je(new_path);
a.bind(default_path);
a.popad64();
a.mov(rcx, "%s/%s/zone");
a.jmp(original_func);
a.bind(new_path);
a.popad64();
a.mov(rcx, "%s/%s");
a.bind(original_func);
a.jmp(game::select(0x1420D6574, 0x1404E24A4));
}
}
std::string get_mod_resized_name(const std::string& dir_name)
@ -259,10 +317,15 @@ namespace workshop
public:
void post_unpack() override
{
// %s/%s/%s/zone -> %s/%s/%s
utils::hook::set<uint8_t>(game::select(0x14303E8D8, 0x140E73BB8), 0);
// %s/%s/zone -> %s/%s
utils::hook::set<uint8_t>(game::select(0x14303E7AD, 0x140E73AD5), 0);
command::add("userContentReload", [](const command::params& params)
{
game::reloadUserContent();
});
enable_zone_folder = game::register_dvar_bool("enable_zone_folder", false, game::DVAR_ARCHIVE, "Load custom zones from the zone folder within the usermaps/mods folder");
utils::hook::jump(game::select(0x1420D6A99, 0x1404E2929), utils::hook::assemble(override_path_mods_stub));
utils::hook::jump(game::select(0x1420D656D, 0x1404E249D), utils::hook::assemble(override_path_usercontent_stub));
load_usermap_hook.create(game::select(0x1420D5700, 0x1404E18B0), load_usermap_stub);
utils::hook::call(game::select(0x1420D67F5, 0x1404E25F2), load_usermap_content_stub);

1
src/client/game/symbols.hpp
View File

@ -107,6 +107,7 @@ namespace game
WEAK symbol<bool()> isModLoaded{0x1420D5020};
WEAK symbol<void(int localClientNum, const char* mod, bool)> loadMod{0x1420D6930};
WEAK symbol<void()> reloadUserContent{0x1420D66C0, 0x1404E25C0};
// Dvar
WEAK symbol<bool(const dvar_t* dvar)> Dvar_IsSessionModeBaseDvar{0x1422C23A0, 0x140576890};