Merge pull request #347 from Brentdevent/dvar_patches

Dvar patches
This commit is contained in:
Maurice Heumann 2023-03-16 17:26:50 +01:00 committed by GitHub
commit bf9a3336d0
9 changed files with 206 additions and 57 deletions

View File

@ -2,13 +2,12 @@
#include "loader/component_loader.hpp"
#include "game/game.hpp"
#include "scheduler.hpp"
#include <utils/hook.hpp>
#include <utils/io.hpp>
#include <utils/string.hpp>
#include "scheduler.hpp"
namespace dvars
{
namespace
@ -114,12 +113,6 @@ namespace dvars
{
return false;
}
//TODO: Fix archive dvars not stripping names from registered dvars
if (dvar->debugName == "cg_unlockall_loot"s || dvar->debugName == "cg_unlockall_purchases"s || dvar->debugName == "cg_unlockall_attachments"s || dvar->debugName == "cg_unlockall_camos"s)
{
return true;
}
return (dvar->flags & game::DVAR_ARCHIVE);
}
@ -201,7 +194,7 @@ namespace dvars
{
if (!game::is_server())
{
scheduler::once(read_archive_dvars, scheduler::pipeline::main);
scheduler::once(read_archive_dvars, scheduler::pipeline::dvars_flags_patched);
dvar_set_variant_hook.create(0x1422C9030_g, dvar_set_variant_stub);
// Show all known dvars in console
@ -217,6 +210,8 @@ namespace dvars
utils::hook::nop(game::select(0x142152227, 0x140509797), 6);
// Show all dvars in dvardump command
utils::hook::nop(game::select(0x142151BF9, 0x140509179), 6);
// Stops game from deleting debug names from archive dvars
utils::hook::set<uint8_t>(game::select(0x1422C5DE0, 0x1405786D0), 0xC3);
}
};
}

View File

@ -0,0 +1,82 @@
#include <std_include.hpp>
#include "loader/component_loader.hpp"
#include "game/game.hpp"
#include "game/utils.hpp"
#include "scheduler.hpp"
#include <utils/hook.hpp>
namespace dvars_patches
{
namespace
{
void patch_dvars()
{
if (game::is_server())
{
game::register_dvar_bool("com_pauseSupported", false, game::DVAR_NONE, "Whether is pause is ever supported by the game mode");
}
}
void patch_flags()
{
game::dvar_set_flags("com_pauseSupported", game::DVAR_SERVERINFO);
if (game::is_client())
{
game::dvar_set_flags("r_dof_enable", game::DVAR_ARCHIVE);
game::dvar_set_flags("r_lodbiasrigid", game::DVAR_ARCHIVE);
game::dvar_set_flags("gpad_stick_deadzone_max", game::DVAR_ARCHIVE);
game::dvar_set_flags("gpad_stick_deadzone_min", game::DVAR_ARCHIVE);
}
scheduler::execute(scheduler::pipeline::dvars_flags_patched);
}
void dof_enabled_stub(utils::hook::assembler& a)
{
const auto update_ads_dof = a.newLabel();
a.pushad64();
a.push(rax);
a.mov(rax, qword_ptr(0x14AE95478_g)); // r_dof_enable
a.cmp(byte_ptr(rax, 0x28), 1);
a.pop(rax);
a.je(update_ads_dof);
a.popad64();
a.jmp(0x141116ECB_g);
a.bind(update_ads_dof);
a.lea(rdx, ptr(rbx, 0x131EB4));
a.mov(ecx, esi);
a.call_aligned(0x141107EC0_g); // CG_UpdateAdsDof
a.popad64();
a.jmp(0x141116F49_g);
}
}
class component final : public generic_component
{
public:
void post_unpack() override
{
patch_dvars();
scheduler::once(patch_flags, scheduler::pipeline::main, 10s);
if (game::is_server())
{
return;
}
// toggle ADS dof based on r_dof_enable
utils::hook::jump(0x141116EBB_g, utils::hook::assemble(dof_enabled_stub), true);
}
};
}
REGISTER_COMPONENT(dvars_patches::component)

View File

@ -5,6 +5,7 @@
#include "scheduler.hpp"
#include "game/game.hpp"
#include "game/utils.hpp"
namespace loot
{
@ -118,16 +119,11 @@ namespace loot
{
void post_unpack() override
{
dvar_cg_unlockall_loot = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_loot"), "cg_unlockall_loot", false, (game::dvarFlags_e)0x0, "Unlocks blackmarket loot");
dvar_cg_unlockall_loot->debugName = "cg_unlockall_loot";
dvar_cg_unlockall_purchases = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_purchases"), "cg_unlockall_purchases", false, (game::dvarFlags_e)0x0, "Unlock all purchases with tokens");
dvar_cg_unlockall_purchases->debugName = "cg_unlockall_purchases";
dvar_cg_unlockall_attachments = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_attachments"), "cg_unlockall_attachments", false, (game::dvarFlags_e)0x0, "Unlocks all attachments");
dvar_cg_unlockall_attachments->debugName = "cg_unlockall_attachments";
dvar_cg_unlockall_camos_and_reticles = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_camos_and_reticles"), "cg_unlockall_camos_and_reticles", false, (game::dvarFlags_e)0x0, "Unlocks all camos and reticles");
dvar_cg_unlockall_camos_and_reticles->debugName = "cg_unlockall_camos_and_reticles";
dvar_cg_unlockall_emblems_and_backings = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_emblems_and_backings"), "cg_unlockall_emblems_and_backings", false, (game::dvarFlags_e)0x0, "Unlocks all emblems and backings");
dvar_cg_unlockall_emblems_and_backings->debugName = "cg_unlockall_emblems_and_backings";
dvar_cg_unlockall_loot = game::register_dvar_bool("cg_unlockall_loot", false, game::DVAR_ARCHIVE, "Unlocks blackmarket loot");
dvar_cg_unlockall_purchases = game::register_dvar_bool("cg_unlockall_purchases", false, game::DVAR_ARCHIVE, "Unlock all purchases with tokens");
dvar_cg_unlockall_attachments = game::register_dvar_bool("cg_unlockall_attachments", false, game::DVAR_ARCHIVE, "Unlocks all attachments");
dvar_cg_unlockall_camos_and_reticles = game::register_dvar_bool("cg_unlockall_camos_and_reticles", false, game::DVAR_ARCHIVE, "Unlocks all camos and reticles");
dvar_cg_unlockall_emblems_and_backings = game::register_dvar_bool("cg_unlockall_emblems_and_backings", false, game::DVAR_ARCHIVE, "Unlocks all emblems and backings");
loot_getitemquantity_hook.create(0x141E82C00_g, loot_getitemquantity_stub);
liveinventory_getitemquantity_hook.create(0x141E09030_g, liveinventory_getitemquantity_stub);

View File

@ -1,7 +1,6 @@
#include <std_include.hpp>
#include "loader/component_loader.hpp"
#include "game/game.hpp"
#include "game/utils.hpp"
#include "party.hpp"
#include "network.hpp"
@ -14,7 +13,6 @@
#include <utils/cryptography.hpp>
#include <utils/concurrency.hpp>
namespace party
{
namespace

View File

@ -1,38 +1,41 @@
#pragma once
namespace scheduler
{
enum pipeline
{
// Asynchronuous pipeline, disconnected from the game
async = 0,
// The game's rendering pipeline
renderer,
// The game's server thread
server,
// The game's main thread
#pragma once
namespace scheduler
{
enum pipeline
{
// Asynchronuous pipeline, disconnected from the game
async = 0,
// The game's rendering pipeline
renderer,
// The game's server thread
server,
// The game's main thread
main,
// Dvars flags have been patched, ready to be set from config file
dvars_flags_patched,
// Dvars are done loading from the config file
dvars_loaded,
count,
};
static const bool cond_continue = false;
dvars_loaded,
count,
};
static const bool cond_continue = false;
static const bool cond_end = true;
void execute(const pipeline type);
void schedule(const std::function<bool()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void loop(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void once(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void on_game_initialized(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
}
void execute(const pipeline type);
void schedule(const std::function<bool()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void loop(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void once(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
void on_game_initialized(const std::function<void()>& callback, pipeline type = pipeline::async,
std::chrono::milliseconds delay = 0ms);
}

View File

@ -646,10 +646,11 @@ namespace game
enum dvarFlags_e
{
DVAR_NONE = 0,
DVAR_ARCHIVE = 1 << 0,
DVAR_USERINFO = 1 << 1,
DVAR_SYSTEMINFO = 1 << 2,
DVAR_CODINFO = 1 << 3,
DVAR_SERVERINFO = 1 << 2,
DVAR_SYSTEMINFO = 1 << 3,
DVAR_LATCH = 1 << 4,
DVAR_ROM = 1 << 5,
DVAR_SAVED = 1 << 6,

View File

@ -106,7 +106,7 @@ namespace game
WEAK symbol<bool(const dvar_t* dvar)> Dvar_GetBool{0x1422BCED0};
WEAK symbol<dvar_t*(dvarStrHash_t hash, const char* dvarName, bool value, dvarFlags_e flags,
const char* description)> Dvar_RegisterBool{
0x1422D0900
0x1422D0900, 0x14057B500
};
WEAK symbol<dvar_t*(dvarStrHash_t hash, const char* dvarName, const char* value, dvarFlags_e flags,
const char* description)> Dvar_RegisterString{
@ -116,6 +116,9 @@ namespace game
WEAK symbol<void(const char* dvarName, const char* string, bool createIfMissing)> Dvar_SetFromStringByName{
0x1422C7500
};
WEAK symbol<dvar_t* (dvar_t* dvar, eModes mode)> Dvar_GetSessionModeSpecificDvar{
0x1422BF500, 0x140575D90
};
// UI
WEAK symbol<void(bool frontend)> UI_CoD_Init{0x141F29010, 0x1404A0A50};

View File

@ -26,4 +26,68 @@ namespace game
return dvar->current.value.integer;
}
bool get_dvar_bool(const char* dvar_name)
{
const auto dvar = Dvar_FindVar(dvar_name);
if (!dvar)
{
return {};
}
return dvar->current.value.enabled;
}
dvar_t* register_dvar_bool(const char* dvar_name, const bool value, const dvarFlags_e flags, const char* description)
{
const auto hash = Dvar_GenerateHash(dvar_name);
auto registered_dvar = Dvar_RegisterBool(hash, dvar_name, value, flags, description);
if (registered_dvar)
{
registered_dvar->debugName = dvar_name;
}
return registered_dvar;
}
void dvar_add_flags(const char* dvar_name, const dvarFlags_e flags)
{
auto dvar = Dvar_FindVar(dvar_name);
if (!dvar)
{
return;
}
auto dvar_to_change = dvar;
if (dvar_to_change->type == DVAR_TYPE_SESSIONMODE_BASE_DVAR)
{
const auto mode = Com_SessionMode_GetMode();
dvar_to_change = Dvar_GetSessionModeSpecificDvar(dvar_to_change, mode);
}
dvar_to_change->flags |= flags;
}
void dvar_set_flags(const char* dvar_name, const dvarFlags_e flags)
{
auto dvar = Dvar_FindVar(dvar_name);
if (!dvar)
{
return;
}
auto dvar_to_change = dvar;
if (dvar_to_change->type == DVAR_TYPE_SESSIONMODE_BASE_DVAR)
{
const auto mode = Com_SessionMode_GetMode();
dvar_to_change = Dvar_GetSessionModeSpecificDvar(dvar_to_change, mode);
}
dvar_to_change->flags = flags;
}
}

View File

@ -1,7 +1,14 @@
#pragma once
#include "structs.hpp"
namespace game
{
std::string get_dvar_string(const char* dvar_name);
int get_dvar_int(const char* dvar_name);
bool get_dvar_bool(const char* dvar_name);
dvar_t* register_dvar_bool(const char* dvar_name, bool value, dvarFlags_e flags, const char* description);
void dvar_add_flags(const char* dvar, dvarFlags_e flags);
void dvar_set_flags(const char* dvar_name, dvarFlags_e flags);
}