Rim/iw7-mod
Rim/iw7-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

alphabetize dvars in config and game_console

Browse Source
This commit is contained in:
quaK 2023-02-09 04:44:49 +02:00
parent e81ffaa242
commit 7e5bf16111
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,6 +318,8 @@ namespace game_console
} }
else if (matches.size() > 1) else if (matches.size() > 1)
{ {
std::sort(matches.begin(), matches.end()); // alphabetize sort
draw_hint_box(static_cast<int>(matches.size()), dvars::con_inputHintBoxColor->current.vector); draw_hint_box(static_cast<int>(matches.size()), dvars::con_inputHintBoxColor->current.vector);
const auto offset_value = floor((con.screen_max[0] - con.globals.x) / 4.f); const auto offset_value = floor((con.screen_max[0] - con.globals.x) / 4.f);

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

@ -80,21 +80,40 @@ namespace patches
return game::Dvar_FindVar("name")->current.string; return game::Dvar_FindVar("name")->current.string;
} }
void dvar_write_single_variable_stub(const game::dvar_t* dvar, int* user_data) std::vector<std::string> dvar_save_variables;
void dvar_write_single_variable(const game::dvar_t* dvar, int* user_data)
{ {
if ((dvar->flags & game::DVAR_FLAG_SAVED) != 0) if ((dvar->flags & game::DVAR_FLAG_SAVED) != 0)
{ {
const char* val = game::Dvar_DisplayableLatchedValue(dvar); const char* val = game::Dvar_DisplayableLatchedValue(dvar);
auto h = *user_data; auto h = *user_data;
auto dvar_name = dvars::dvar_get_name(dvar);
if (!dvar_name.empty()) std::string dvar_name = dvars::dvar_get_name(dvar);
{ if (dvar_name.empty())
game::FS_Printf(h, "seta %s \"%s\"\n", dvar_name.data(), val);
}
else
{ {
game::FS_Printf(h, "setcl %d \"%s\"\n", dvar->checksum, val); game::FS_Printf(h, "setcl %d \"%s\"\n", dvar->checksum, val);
} }
else
{
dvar_save_variables.push_back(dvar_name);
}
}
}
void dvar_write_variables_stub(int handle)
{
dvar_save_variables.clear();
int* user_data = &handle;
game::Dvar_ForEach(dvar_write_single_variable, user_data);
std::sort(dvar_save_variables.begin(), dvar_save_variables.end()); // alphabetize sort
for (size_t i = 0; i < dvar_save_variables.size(); i++)
{
const auto* dvar_name = dvar_save_variables.at(i).data();
const auto* dvar = game::Dvar_FindVar(dvar_name);
const char* val = game::Dvar_DisplayableLatchedValue(dvar);
game::FS_Printf(handle, "seta %s \"%s\"\n", dvar_name, val);
} }
} }
@ -191,7 +210,7 @@ namespace patches
utils::hook::jump(0xD32770_b, live_get_local_client_name); utils::hook::jump(0xD32770_b, live_get_local_client_name);
// write better config // write better config
utils::hook::jump(0xBB2A50_b, dvar_write_single_variable_stub); utils::hook::jump(0xBB2A90_b, dvar_write_variables_stub);
// show missing fastfiles // show missing fastfiles
utils::hook::call(0x3BBD4B_b, missing_content_error_stub); utils::hook::call(0x3BBD4B_b, missing_content_error_stub);

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

@ -80,6 +80,7 @@ namespace game
WEAK symbol<void(const char* name, const char* string)> Dvar_SetCommand{ 0xCECB30 }; WEAK symbol<void(const char* name, const char* string)> Dvar_SetCommand{ 0xCECB30 };
WEAK symbol<dvar_t* (const char* name)> Dvar_FindVar{ 0xCEA460 }; WEAK symbol<dvar_t* (const char* name)> Dvar_FindVar{ 0xCEA460 };
WEAK symbol<void(void* callback, void* userData)> Dvar_ForEach{ 0xCEA480 };
WEAK symbol<dvar_t* (unsigned int checksum)> Dvar_FindMalleableVar{ 0xCEA3C0 }; WEAK symbol<dvar_t* (unsigned int checksum)> Dvar_FindMalleableVar{ 0xCEA3C0 };
WEAK symbol<void(const dvar_t* dvar)> Dvar_ClearModified{ 0xCE9E90 }; WEAK symbol<void(const dvar_t* dvar)> Dvar_ClearModified{ 0xCE9E90 };
WEAK symbol<const char* (const dvar_t* dvar)> Dvar_DisplayableLatchedValue{ 0xCEA1D0 }; WEAK symbol<const char* (const dvar_t* dvar)> Dvar_DisplayableLatchedValue{ 0xCEA1D0 };