XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Changes

Browse Source
This commit is contained in:
Joelrau 2021-01-09 21:21:54 +02:00
parent 1b185727e5
commit c6bbca328a
5 changed files with 172 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
src/client/component/dvars.cpp
View File

@ -8,60 +8,104 @@
namespace dvars
{
class dvar_bool
{
public:
const char* name;
bool value;
unsigned int flags;
const char* description;
};
class dvar_float
{
public:
const char* name;
float value;
float min;
float max;
unsigned int flags;
const char* description;
};
class dvar_int
{
public:
const char* name;
int value;
int min;
int max;
unsigned int flags;
const char* description;
};
class dvar_string
{
public:
const char* name;
const char* value;
unsigned int flags;
const char* description;
};
class dvar_setint
{
public:
const char* name;
int integer;
};
class dvar_setstring
{
public:
const char* name;
const char* string;
};
namespace
{
template<typename T>
T* find_dvar(std::vector<T>* vec, const char* name)
{
for (auto i = 0; i < vec->size(); i++)
{
if (!strcmp(name, vec->at(i).name))
{
return &vec->at(i);
}
}
return nullptr;
}
}
namespace disable
{
static std::vector<dvar_setint> set_int_disables;
static std::vector<dvar_setstring> set_string_disables;
void Dvar_SetInt(const char* dvar_name)
{
dvar_setint values;
values.name = dvar_name;
set_int_disables.push_back(std::move(values));
}
void Dvar_SetString(const char* dvar_name)
{
dvar_setstring values;
values.name = dvar_name;
set_string_disables.push_back(std::move(values));
}
}
namespace override
{
class dvar_bool
{
public:
const char* name;
bool value;
unsigned int flags;
const char* description;
};
class dvar_float
{
public:
const char* name;
float value;
float min;
float max;
unsigned int flags;
const char* description;
};
class dvar_int
{
public:
const char* name;
int value;
int min;
int max;
unsigned int flags;
const char* description;
};
class dvar_string
{
public:
const char* name;
const char* value;
unsigned int flags;
const char* description;
};
class dvar_setstring
{
public:
const char* dvar_name;
const char* string;
};
static std::vector<dvar_bool> bool_overrides;
static std::vector<dvar_float> float_overrides;
static std::vector<dvar_int> int_overrides;
static std::vector<dvar_string> string_overrides;
static std::vector<dvar_setint> set_int_overrides;
static std::vector<dvar_setstring> set_string_overrides;
void Dvar_RegisterBool(const char* name, bool value, unsigned int flags, const char* description)
@ -108,12 +152,20 @@ namespace dvars
string_overrides.push_back(std::move(values));
}
void Dvar_SetString(const char* dvar_name, const char* string)
void Dvar_SetInt(const char* name, int integer)
{
dvar_setstring setstring;
setstring.dvar_name = dvar_name;
setstring.string = string;
set_string_overrides.push_back(std::move(setstring));
dvar_setint values;
values.name = name;
values.integer = integer;
set_int_overrides.push_back(std::move(values));
}
void Dvar_SetString(const char* name, const char* string)
{
dvar_setstring values;
values.name = name;
values.string = string;
set_string_overrides.push_back(std::move(values));
}
}
@ -122,20 +174,18 @@ namespace dvars
utils::hook::detour dvar_register_int_hook;
utils::hook::detour dvar_register_string_hook;
utils::hook::detour dvar_set_int_hook;
utils::hook::detour dvar_set_string_hook;
game::dvar_t* dvar_register_bool(const char* name, bool value, unsigned int flags, const char* description)
{
for (auto i = 0; i < override::bool_overrides.size(); i++)
auto* var = find_dvar(&override::bool_overrides, name);
if (var)
{
if (!strcmp(name, override::bool_overrides[i].name))
{
auto* dv = &override::bool_overrides[i];
value = dv->value;
flags = dv->flags;
description = dv->description;
break;
}
value = var->value;
flags = var->flags;
description = var->description;
}
return dvar_register_bool_hook.invoke<game::dvar_t*>(name, value, flags, description);
@ -143,18 +193,14 @@ namespace dvars
game::dvar_t* dvar_register_float(const char* name, float value, float min, float max, unsigned int flags, const char* description)
{
for (auto i = 0; i < override::float_overrides.size(); i++)
auto* var = find_dvar(&override::float_overrides, name);
if (var)
{
if (!strcmp(name, override::float_overrides[i].name))
{
auto* dv = &override::float_overrides[i];
value = dv->value;
min = dv->min;
max = dv->max;
flags = dv->flags;
description = dv->description;
break;
}
value = var->value;
min = var->min;
max = var->max;
flags = var->flags;
description = var->description;
}
return dvar_register_float_hook.invoke<game::dvar_t*>(name, value, min, max, flags, description);
@ -162,18 +208,14 @@ namespace dvars
game::dvar_t* dvar_register_int(const char* name, int value, int min, int max, unsigned int flags, const char* description)
{
for (auto i = 0; i < override::int_overrides.size(); i++)
auto* var = find_dvar(&override::int_overrides, name);
if (var)
{
if (!strcmp(name, override::int_overrides[i].name))
{
auto* dv = &override::int_overrides[i];
value = dv->value;
min = dv->min;
max = dv->max;
flags = dv->flags;
description = dv->description;
break;
}
value = var->value;
min = var->min;
max = var->max;
flags = var->flags;
description = var->description;
}
return dvar_register_int_hook.invoke<game::dvar_t*>(name, value, min, max, flags, description);
@ -181,33 +223,49 @@ namespace dvars
game::dvar_t* dvar_register_string(const char* name, const char* value, unsigned int flags, const char* description)
{
for (auto i = 0; i < override::string_overrides.size(); i++)
auto* var = find_dvar(&override::string_overrides, name);
if (var)
{
if (!strcmp(name, override::string_overrides[i].name))
{
auto* dv = &override::string_overrides[i];
value = dv->value;
flags = dv->flags;
description = dv->description;
break;
}
value = var->value;
flags = var->flags;
description = var->description;
}
return dvar_register_string_hook.invoke<game::dvar_t*>(name, value, flags, description);
}
bool dvar_set_string(game::dvar_t* dvar, const char* string)
void dvar_set_int(game::dvar_t* dvar, int integer)
{
for (auto i = 0; i < override::set_string_overrides.size(); i++)
auto* var = find_dvar(&disable::set_int_disables, dvar->name);
if (var)
{
if (!strcmp(dvar->name, override::set_string_overrides[i].dvar_name))
{
string = override::set_string_overrides[i].string;
break;
}
return;
}
return dvar_set_string_hook.invoke<bool>(dvar, string);
var = find_dvar(&override::set_int_overrides, dvar->name);
if (var)
{
integer = var->integer;
}
return dvar_set_int_hook.invoke<void>(dvar, integer);
}
void dvar_set_string(game::dvar_t* dvar, const char* string)
{
auto* var = find_dvar(&disable::set_string_disables, dvar->name);
if (var)
{
return;
}
var = find_dvar(&override::set_string_overrides, dvar->name);
if (var)
{
string = var->string;
}
return dvar_set_string_hook.invoke<void>(dvar, string);
}
class component final : public component_interface
@ -220,6 +278,7 @@ namespace dvars
dvar_register_int_hook.create(SELECT_VALUE(0x140371CF0, 0x1404C1080), &dvar_register_int);
dvar_register_string_hook.create(SELECT_VALUE(0x140372050, 0x1404C1450), &dvar_register_string);
dvar_set_int_hook.create(SELECT_VALUE(0x1403738D0, 0x1404C2F40), &dvar_set_int);
dvar_set_string_hook.create(SELECT_VALUE(0x140373DE0, 0x1404C3610), &dvar_set_string);
}
};

6
src/client/component/dvars.hpp
View File

@ -2,6 +2,12 @@
namespace dvars
{
namespace disable
{
void Dvar_SetInt(const char* dvar_name);
void Dvar_SetString(const char* dvar_name);
}
namespace override
{
void Dvar_RegisterBool(const char* name, bool value, unsigned int flags, const char* description = "");

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

@ -103,7 +103,7 @@ namespace network
get_callbacks()[utils::string::to_lower(command)] = callback;
}
void dw_send_to(const unsigned int size, const char* src, game::netadr_s* a3)
void dw_send_to_stub(const unsigned int size, const char* src, game::netadr_s* a3)
{
sockaddr s = {};
game::NetadrToSockadr(a3, &s);
@ -186,7 +186,7 @@ namespace network
// redirect dw_sendto to raw socket
//utils::hook::jump(0x1404D850A, reinterpret_cast<void*>(0x1404D849A));
utils::hook::call(0x1404D851F, dw_send_to);
utils::hook::call(0x1404D851F, dw_send_to_stub);
// intercept command handling
utils::hook::jump(0x14020A175, utils::hook::assemble(handle_command_stub), true);

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

@ -21,7 +21,7 @@ namespace steam_proxy
bool is_disabled()
{
static const auto disabled = utils::flags::has_flag("no-steam");
static const auto disabled = utils::flags::has_flag("nosteam");
return disabled;
}
}

8
src/client/game/demonware/services/bdStorage.cpp
View File

@ -23,11 +23,11 @@ namespace demonware
this->register_service(11, &bdStorage::delete_user_file);
this->register_service(12, &bdStorage::get_user_file);
this->map_publisher_resource("motd-english\\.txt", DW_MOTD);
this->map_publisher_resource("motd-.*\\.txt", DW_MOTD);
this->map_publisher_resource("mm\\.cfg", DW_MM_CONFIG);
this->map_publisher_resource("playlists_tu22\\.aggr", DW_PLAYLISTS);
this->map_publisher_resource("social_tu22\\.cfg", DW_SOCIAL_CONFIG);
this->map_publisher_resource("entitlement_config\\.info", DW_ENTITLEMENT_CONFIG);
this->map_publisher_resource("playlists(_.+)?\\.aggr", DW_PLAYLISTS);
this->map_publisher_resource("social_[Tt][Uu][0-9]+\\.cfg", DW_SOCIAL_CONFIG);
this->map_publisher_resource("entitlement_config_[Tt][Uu][0-9]+\\.info", DW_ENTITLEMENT_CONFIG);
publisher_resources_.emplace_back(std::regex{"heatmap\\.raw"}, generate_heatmap());
}