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

handle crashes in Material_Compare

Browse Source
This commit is contained in:
m
2023-01-11 10:06:24 -06:00
parent d080e4e4e2
commit 62d8d0f2f4
3 changed files with 147 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/component/fastfiles.cpp
View File

@ -22,6 +22,7 @@ namespace fastfiles
{
utils::hook::detour db_try_load_x_file_internal_hook;
utils::hook::detour db_find_xasset_header_hook;
game::dvar_t* g_dump_scripts;
std::vector<HANDLE> fastfile_handles;

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

@ -22,6 +22,7 @@ namespace materials
utils::hook::detour db_material_streaming_fail_hook;
utils::hook::detour material_register_handle_hook;
utils::hook::detour db_get_material_index_hook;
utils::hook::detour material_compare_hook;
struct material_data_t
{
@ -156,6 +157,27 @@ namespace materials
return db_get_material_index_hook.invoke<unsigned int>(material);
}
#ifdef DEBUG
char material_compare_stub(unsigned int index_a, unsigned int index_b)
{
char result = 0;
__try
{
result = material_compare_hook.invoke<char>(index_a, index_b);
}
__except (EXCEPTION_EXECUTE_HANDLER)
{
const auto* material_a = utils::hook::invoke<game::Material*>(0x395FE0_b, index_a);
const auto* material_b = utils::hook::invoke<game::Material*>(0x395FE0_b, index_b);
console::error("Material_Compare: %s - %s (%d - %d)",
material_a->name, material_b->name, material_a->info.sortKey, material_b->info.sortKey);
}
return result;
}
#endif
}
void add(const std::string& name, const std::string& data)
@ -205,6 +227,9 @@ namespace materials
material_register_handle_hook.create(game::Material_RegisterHandle, material_register_handle_stub);
db_material_streaming_fail_hook.create(SELECT_VALUE(0x1FB400_b, 0x3A1600_b), db_material_streaming_fail_stub);
db_get_material_index_hook.create(SELECT_VALUE(0x1F1D80_b, 0x396000_b), db_get_material_index_stub);
#ifdef DEBUG
material_compare_hook.create(0x693D1E_b, material_compare_stub);
#endif
}
};
}