nskinz advancedfx-v0.1.18

- Try Fix quickswitch animation (advncedfx/nSkinz#31)

Author: dtugend

src/Hooks/Hooks.hpp

@@ -41,6 +41,12 @@ namespace hooks
 		static Fn* m_original;
 	};
 
+	struct C_BaseViewModel_SetSequence {
+		using Fn = void __fastcall(sdk::C_BaseViewModel* thisptr, void*, int nSequence);
+		static Fn hooked;
+		static Fn* m_original;
+	};
+
 	struct C_BaseAttributableItem_UpdateOnRemove
 	{
 		using Fn = void __fastcall(sdk::C_BaseAttributableItem* thisptr, void*);
@@ -52,5 +58,4 @@ namespace hooks
 
 	extern auto __cdecl modelindex_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) -> void;
 	extern auto __cdecl weapon_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) -> void;
-	extern auto __cdecl sequence_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) -> void;
 }

src/Hooks/PostDataUpdate.cpp

@@ -63,16 +63,17 @@ std::map<sdk::C_BaseAttributableItem*, int> g_weapon_to_orgindex;
 
 hooks::C_BaseAttributableItem_UpdateOnRemove::Fn* hooks::C_BaseAttributableItem_UpdateOnRemove::m_original;
 
-auto __fastcall hooks::C_BaseAttributableItem_UpdateOnRemove::hooked(sdk::C_BaseAttributableItem* thisptr, void*) -> void
+auto __fastcall hooks::C_BaseAttributableItem_UpdateOnRemove::hooked(sdk::C_BaseAttributableItem* This, void* Edx) -> void
 {
-	g_weapon_to_orgindex.erase(thisptr);
+	g_weapon_to_orgindex.erase(This);
+	hooks::C_BaseAttributableItem_UpdateOnRemove::m_original(This, Edx);
 }
 
 void hook_weapon_update_on_remove(sdk::C_BaseAttributableItem* thisptr) {
 	static bool firstRun = true;
 	if (firstRun) {
 		firstRun = false;
-		vmt_multi_hook weapon_update_on_remove_hook;
+		static vmt_multi_hook weapon_update_on_remove_hook;
 		if (weapon_update_on_remove_hook.initialize_and_hook_instance(thisptr))
 			weapon_update_on_remove_hook.apply_hook<hooks::C_BaseAttributableItem_UpdateOnRemove>(127);
 	}

src/Hooks/Sequence.cpp

@@ -523,62 +523,61 @@ class SequenceMap {
 
 extern std::map<sdk::C_BaseAttributableItem*, int> g_weapon_to_orgindex;
 
-static auto do_sequence_remapping(sdk::CRecvProxyData* data, sdk::C_BaseViewModel* entity) -> void
+static auto do_sequence_remapping(sdk::C_BaseViewModel* entity, int nSequence) -> int
 {
 	const auto owner = get_entity_from_handle<sdk::C_BasePlayer>(entity->GetOwner());
 
 	if (!(owner && owner->IsPlayer() && static_cast<sdk::C_BasePlayer*>(owner)->GetLifeState() == sdk::LifeState::ALIVE))
-		return;
+		return nSequence;
 
 	const auto view_model_weapon = get_entity_from_handle<sdk::C_BaseAttributableItem>(entity->GetWeapon());
 
 	if(!view_model_weapon)
-		return;
+		return nSequence;
 
 	const auto weapon_info = game_data::get_weapon_info(view_model_weapon->GetItemDefinitionIndex());
 
 	if(!weapon_info)
-		return;
+		return nSequence;
 
 	const auto definition_index = view_model_weapon->GetItemDefinitionIndex();
 
 	if (!is_knife(definition_index))
-		return;
+		return nSequence;
 
 	sdk::player_info_t player_info;
 	if (!g_engine->GetPlayerInfo(owner->GetIndex(), &player_info))
-		return;
+		return nSequence;
 
 	const auto active_conf = g_config.get_by_definition_index(player_info.userid, WEAPON_KNIFE);
 	if (nullptr == active_conf || 0 == active_conf->definition_override_index)
-		return;
+		return nSequence;
 
-	auto& sequence = data->m_Value.m_Int;
 	int orgIndex = definition_index;
 	auto it = g_weapon_to_orgindex.find(view_model_weapon);
 	if (it != g_weapon_to_orgindex.end())
 		orgIndex = it->second;
-	sequence = g_SequenceMap.MapSequence(orgIndex, sequence, active_conf->definition_override_index);
+	return g_SequenceMap.MapSequence(orgIndex, nSequence, active_conf->definition_override_index);
 }
 
-// Replacement function that will be called when the view model animation sequence changes.
-auto __cdecl hooks::sequence_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) -> void
-{
-	const auto view_model = static_cast<sdk::C_BaseViewModel*>(entity);
 
-	// Ensure our other dynamic object hooks are in place.
-	// Must do this from a game thread.
-	ensure_dynamic_hooks();
+static std::map<void*,vmt_multi_hook *> C_BaseViewModel_SetSequence_hooks;
 
-	static auto original_fn = g_sequence_hook->get_original_function();
+auto __fastcall hooks::C_BaseViewModel_SetSequence::hooked(sdk::C_BaseViewModel* This, void* Edx, int nSequence) -> void
+{
+	auto &pHook = C_BaseViewModel_SetSequence_hooks[*(void**)This];
+	pHook->get_original_function<void (__fastcall *)(sdk::C_BaseViewModel*, void*, int)>(219)(This, Edx, do_sequence_remapping(This, nSequence));
+}
 
-	// Remove the constness from the proxy data allowing us to make changes.
-	const auto proxy_data = const_cast<sdk::CRecvProxyData*>(proxy_data_const);
+void hook_C_BaseViewModel_SetSequence(sdk::C_BaseViewModel* thisptr) {
 
-	do_sequence_remapping(proxy_data, view_model);
+	if (C_BaseViewModel_SetSequence_hooks.contains(*(void**)thisptr)) return;
 
-	// Call the original function with our edited data.
-	original_fn(proxy_data_const, entity, output);
+	vmt_multi_hook* pHook = new vmt_multi_hook();
+	if (pHook->initialize_and_hook_instance(thisptr)) {
+		pHook->hook_function(&hooks::C_BaseViewModel_SetSequence::hooked, 219);
+		C_BaseViewModel_SetSequence_hooks[*(void**)thisptr] = pHook;
+	}
 }
 
 bool get_fixup_view_model_index(sdk::C_BaseViewModel* view_model, int& outNewIndex, int& outOrgIndex);
@@ -601,6 +600,8 @@ auto __cdecl hooks::weapon_proxy_fn(const sdk::CRecvProxyData* proxy_data_const,
 	const auto view_model = static_cast<sdk::C_BaseViewModel*>(entity);
 
 	ensure_dynamic_hooks();
+	hook_C_BaseViewModel_SetSequence(view_model);
+
 	static auto original_fn = g_weapon_hook->get_original_function();
 
 	original_fn(proxy_data_const, entity, output);

src/SDK/CBaseEntity.hpp

@@ -81,7 +81,6 @@ namespace sdk
 		NETVAR(GetOwner, "CBaseViewModel", "m_hOwner", CBaseHandle);
 		NETPROP(GetModelIndexProp, "CBaseViewModel", "m_nModelIndex");
 		NETPROP(GetWeaponProp, "CBaseViewModel", "m_hWeapon");
-		NETPROP(GetSequenceProp, "CBaseViewModel", "m_nSequence");
 	};
 
 	class C_PlayerResource

src/gui.cpp

@@ -263,7 +263,7 @@ void draw_gui()
 		ImGui::PopItemWidth();
 		ImGui::Columns(1);
 
-		ImGui::Text("nSkinz by namazso (advancedfx-v0.1.17)");
+		ImGui::Text("nSkinz by namazso (advancedfx-v0.1.18)");
 
 		ImGui::End();
 	}

src/nSkinz.cpp

@@ -136,9 +136,6 @@ auto initialize(void* instance) -> void
 	const auto weapon_prop = sdk::C_BaseViewModel::GetWeaponProp();
 	g_weapon_hook = new recv_prop_hook(weapon_prop, &hooks::weapon_proxy_fn);
 
-	const auto sequence_prop = sdk::C_BaseViewModel::GetSequenceProp();
-	g_sequence_hook = new recv_prop_hook(sequence_prop, &hooks::sequence_proxy_fn);
-
 	const auto team_arr_prop = sdk::C_CS_PlayerResource::GetTeamProp();
 	const auto team_prop = team_arr_prop->m_pDataTable->m_pProps;
 	const auto proxy_addr = std::uintptr_t(team_prop->m_ProxyFn);