alterware/iw6-mod
1
0
Fork 4
Code Issues 3 Pull Requests 13 Packages Projects Releases Wiki Activity

chore: update

Browse Source
This commit is contained in:
6arelyFuture
2025-05-21 18:47:56 +02:00
parent 9052daab5c
commit 61f0374d10
11 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/client/component/dvar_cheats.cpp
View File

@ -112,23 +112,24 @@ namespace dvar_cheats
void cg_set_client_dvar_from_server(const int local_client_num, game::mp::cg_s* cg, const char* dvar_id, const char* value)
{
if (dvar_id == "cg_fov"s || dvar_id == "com_maxfps"s)
{
return;
}
const auto* dvar = game::Dvar_FindVar(dvar_id);
if (dvar)
{
// If we send as string, it can't be set with source SERVERCMD because the game only allows that source on real server cmd dvars.
// Just use external instead as if it was being set by the console
game::Dvar_SetFromStringByNameFromSource(dvar_id, value, game::DvarSetSource::DVAR_SOURCE_EXTERNAL);
}
else
if (!dvar)
{
// Not a dvar name, assume it is an id and the game will handle normally
game::CG_SetClientDvarFromServer(local_client_num, cg, dvar_id, value);
return;
}
if (dvar && ((dvar->flags & game::DVAR_FLAG_SAVED) != 0))
{
console::info("Not allowing server to override archive dvar '%s'\n", dvar->name);
return;
}
// If we send as string, it can't be set with source SERVERCMD because the game only allows that source on real server cmd dvars.
// Just use external instead as if it was being set by the console
game::Dvar_SetFromStringByNameFromSource(dvar_id, value, game::DVAR_SOURCE_EXTERNAL);
}
void set_client_dvar_by_string(const int entity_num, const char* value)

27
src/client/component/gsc/script_error.cpp
View File

@ -113,6 +113,26 @@ namespace gsc
return res;
}
bool player_cmd_set_client_dvar_is_valid_name(const char* dvar_name)
{
if (!game::Dvar_IsValidName(dvar_name))
{
scr_error(va("%s is an invalid dvar name", dvar_name));
}
return true;
}
void player_cmd_set_client_dvar_server_dvar()
{
scr_error("server dvar cannot be set as a client dvar");
}
void player_cmd_set_client_dvar_non_writable_dvar()
{
scr_error("non-writable dvar cannot be set as a client dvar");
}
}
unsigned int scr_get_object(unsigned int index)
@ -300,6 +320,13 @@ namespace gsc
utils::hook::jump(SELECT_VALUE(0x1403DE150, 0x1404390B0), scr_get_pointer_type);
utils::hook::jump(SELECT_VALUE(0x1403DE320, 0x140439280), scr_get_type);
utils::hook::jump(SELECT_VALUE(0x1403DE390, 0x1404392F0), scr_get_type_name);
if (game::environment::is_mp())
{
utils::hook::call(0x14038A4F7, player_cmd_set_client_dvar_is_valid_name);
utils::hook::call(0x14038A52F, player_cmd_set_client_dvar_server_dvar);
utils::hook::call(0x14038A53A, player_cmd_set_client_dvar_non_writable_dvar);
}
}
void pre_destroy() override

2
src/client/component/gsc/script_loading.cpp
View File

@ -347,7 +347,7 @@ namespace gsc
build = static_cast<xsk::gsc::build>(static_cast<unsigned int>(build) | static_cast<unsigned int>(xsk::gsc::build::dev_blocks));
}
gsc_ctx->init(build, []([[maybe_unused]] auto const* ctx, const auto& included_path) -> std::pair<xsk::gsc::buffer, std::vector<std::uint8_t>>
gsc_ctx->init(build, []([[maybe_unused]] const auto* ctx, const auto& included_path) -> std::pair<xsk::gsc::buffer, std::vector<std::uint8_t>>
{
const auto script_name = std::filesystem::path(included_path).replace_extension().string();

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

@ -116,7 +116,7 @@ namespace logger
// Make havok script's print function actually print
utils::hook::jump(SELECT_VALUE(0x1406283A4, 0x140732184), print);
logger_dev = game::Dvar_RegisterBool("logger_dev", false, game::DVAR_FLAG_SAVED, "Print dev stuff");
logger_dev = game::Dvar_RegisterBool("logger_dev", false, game::DVAR_FLAG_NONE, "Print dev stuff");
}
};
}

8
src/client/component/mods.cpp
View File

@ -16,7 +16,7 @@ namespace mods
{
utils::hook::detour sys_create_file_hook;
void db_build_os_path_from_source(const char* zone_name, game::FF_DIR source, int size, char* filename)
void db_build_os_path_from_source(const char* zone_name, const game::FF_DIR source, const int size, char* filename)
{
char user_map[MAX_PATH]{};
@ -41,9 +41,9 @@ namespace mods
}
}
game::Sys_File sys_create_file_stub(const char* dir, const char* filename)
game::Sys_File sys_create_file_stub(game::Sys_Folder folder, const char* base_filename)
{
auto result = sys_create_file_hook.invoke<game::Sys_File>(dir, filename);
auto result = sys_create_file_hook.invoke<game::Sys_File>(folder, base_filename);
if (result.handle != INVALID_HANDLE_VALUE)
{
@ -56,7 +56,7 @@ namespace mods
}
// .ff extension was added previously
if (!std::strcmp(filename, "mod.ff") && mods::db_mod_file_exists())
if (!std::strcmp(base_filename, "mod.ff") && mods::db_mod_file_exists())
{
char file_path[MAX_PATH]{};
db_build_os_path_from_source("mod", game::FFD_MOD_DIR, sizeof(file_path), file_path);

4
src/client/component/patches.cpp
View File

@ -166,11 +166,11 @@ namespace patches
game::AimAssist_AddToTargetList(a1, a2);
}
game::dvar_t* register_cg_fov_stub(const char* name, float value, float min, float /*max*/,
game::dvar_t* register_cg_fov_stub(const char* name, const float value, const float min, [[maybe_unused]] const float max,
const unsigned int flags,
const char* description)
{
return game::Dvar_RegisterFloat(name, value, min, 160, flags | 1, description);
return game::Dvar_RegisterFloat(name, value, min, 160, flags, description);
}
void bsp_sys_error_stub(const char* error, const char* arg1)

5
src/client/component/renderer.cpp
View File

@ -46,12 +46,11 @@ namespace renderer
return;
}
dvars::r_fullbright = game::Dvar_RegisterBool("r_fullbright", false, game::DvarFlags::DVAR_FLAG_SAVED,
dvars::r_fullbright = game::Dvar_RegisterBool("r_fullbright", false, game::DVAR_FLAG_CHEAT,
"Toggles rendering without lighting");
r_init_draw_method_hook.create(SELECT_VALUE(0x1404FF600, 0x1405CB470), &r_init_draw_method_stub);
r_update_front_end_dvar_options_hook.create(
SELECT_VALUE(0x140535FF0, 0x140603240), &r_update_front_end_dvar_options_stub);
r_update_front_end_dvar_options_hook.create(SELECT_VALUE(0x140535FF0, 0x140603240), &r_update_front_end_dvar_options_stub);
}
};
}

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

@ -1181,6 +1181,7 @@ namespace game
DVAR_FLAG_LATCHED = 0x2,
DVAR_FLAG_CHEAT = 0x4,
DVAR_FLAG_REPLICATED = 0x8,
DVAR_FLAG_SCRIPTINFO = 0x10,
DVAR_FLAG_INTERNAL = 0x80,
DVAR_FLAG_EXTERNAL = 0x100,
DVAR_FLAG_SERVERINFO = 0x400,

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

@ -91,6 +91,7 @@ namespace game
WEAK symbol<void(const char*, const char*, DvarSetSource)> Dvar_SetFromStringByNameFromSource{0x14042D000, 0x1404F00B0};
WEAK symbol<void()> Dvar_Sort{0x14042DEF0, 0x1404F1210};
WEAK symbol<const char*(dvar_t* dvar, DvarValue value)> Dvar_ValueToString{0x14042E710, 0x1404F1A30};
WEAK symbol<bool(const char* dvarName)> Dvar_IsValidName{0x0, 0x1404ED0E0};
WEAK symbol<long long (const char* qpath, char** buffer)> FS_ReadFile{0x14041D0B0, 0x1404DE900};
WEAK symbol<void(void* buffer)> FS_FreeFile{0x14041D0A0, 0x1404DE8F0};