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

use tag_weapon when other tags aren't found

Browse Source
This commit is contained in:
quaK 2022-08-30 19:23:41 +03:00
parent 3f1844b33a
commit a5e91259a8
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/client/component/weapon.cpp
View File

@ -42,6 +42,25 @@ namespace weapon
}
}
utils::hook::detour xmodel_get_bone_index_hook;
bool xmodel_get_bone_index_stub(game::XModel* model, game::scr_string_t name, unsigned int offset, char* index)
{
auto result = xmodel_get_bone_index_hook.invoke<bool>(model, name, offset, index);
if (!result)
{
if (name == game::SL_GetString("tag_weapon_right", 0) ||
name == game::SL_GetString("tag_knife_attach", 0))
{
result = xmodel_get_bone_index_hook.invoke<bool>(model, game::SL_GetString("tag_weapon", 0), offset, index);
if (result)
{
console::debug("using tag_weapon instead of %s (%s, %d)\n", game::SL_ConvertToString(name), model->name, offset);
}
}
}
return result;
}
template <typename T>
void set_weapon_field(const std::string& weapon_name, unsigned int field, T value)
{
@ -86,8 +105,12 @@ namespace weapon
{
if (!game::environment::is_sp())
{
// precache all weapons that are loaded in zones
g_setup_level_weapon_def_hook.create(0x462630_b, g_setup_level_weapon_def_stub);
// use tag_weapon if tag_weapon_right or tag_knife_attach are not found on model
xmodel_get_bone_index_hook.create(0x5C82B0_b, xmodel_get_bone_index_stub);
// disable custom weapon index mismatch (fix for custom attachments) (NEEDS TESTING)
//utils::hook::set<uint8_t>(0x11B910_b, 0xC3); // CG_SetupCustomWeapon
}

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

@ -1411,6 +1411,11 @@ namespace game
const char* name;
};
struct XModel
{
const char* name;
};
struct WeaponDef
{
const char* name;
@ -1427,6 +1432,7 @@ namespace game
LuaFile* luaFile;
GfxImage* image;
TTF* ttf;
XModel* model;
WeaponDef* weapon;
};