nSkinz advancedfx-v0.1.30

dtugend · dtugend · commit 872c3cb07114 · 2023-04-02T04:03:11.000+02:00
- Fixes #51 view model inspect-reload wiggling. - Other fix(es).
diff --git a/README.md b/README.md
@@ -31,16 +31,16 @@ Although written from scratch, nSkinz was heavily influenced by [chameleon-ng](h
 
 ## Requirements for compiling
 
-* Tested under: [Microsoft Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/community/)
-* Latest [Git](https://git-scm.com/downloads)
+* Tested under: Microsoft Visual Studio Community 2022
+* [DirectX SDK](https://www.microsoft.com/en-ca/download/details.aspx?id=6812)
 
 ## Usage
 
 Currently only Windows is supported, however this may change ~~in the future~~ if you submit a PR because I'm lazy.
 
 * Clone the source with:
-```git clone --recurse-submodules https://github.com/advancedfx/nSkinz.git```
-* Compile into a x86 library using your preferred compiler
+```git clone --recursive https://github.com/advancedfx/nSkinz.git```
+* Compile using your preferred compiler
 * Inject the resulting library into the game
 * Press <kbd>Insert</kbd> to bring up the menu.
 * Setup weapon configuration(s)
diff --git a/src/Hooks/Hooks.hpp b/src/Hooks/Hooks.hpp
@@ -41,11 +41,11 @@ 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_BaseViewModel_SetSequence {
+		using Fn = void __fastcall(sdk::C_BaseViewModel* thisptr, void*, int nSequence);
+		static Fn hooked;
+		static Fn* m_original;
+	};
 
 	struct C_BaseAttributableItem_UpdateOnRemove
 	{
@@ -58,5 +58,5 @@ 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 void __cdecl sequence_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output);
+	//extern auto __cdecl sequence_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) -> void;
 }
diff --git a/src/Hooks/PostDataUpdate.cpp b/src/Hooks/PostDataUpdate.cpp
@@ -345,30 +345,3 @@ void On_FRAME_NET_UPDATE_POSTDATAUPDATE_START(sdk::C_BasePlayer* local)
 		}
 	}*/
 }
-
-void patch_view_model(sdk::C_BaseViewModel * view_model) {
-	if (nullptr == view_model) return;
-
-	hook_viewmodel(view_model);
-
-	const auto view_model_weapon = get_entity_from_handle<sdk::C_BaseAttributableItem>(view_model->GetWeapon());
-
-	if (view_model_weapon) {
-		patch_weapon(view_model_weapon);
-
-		auto item = (sdk::C_BaseAttributableItem*)view_model_weapon;
-
-		auto& definition_index = view_model_weapon->GetItemDefinitionIndex();
-		// All knives are terrorist knives.
-		const auto active_conf = g_config.get_from_xuid_by_definition_index(item->GetOriginalOwnerXuidLow(), item->GetOriginalOwnerXuidHigh(), is_knife(definition_index) ? WEAPON_KNIFE : definition_index);
-		if (active_conf && active_conf->definition_override_index) {
-			hook_weapon_update_on_remove(view_model_weapon);
-			auto emplace_result = g_weapon_to_orgindex.emplace(view_model_weapon, definition_index);
-			view_model_weapon->GetItemDefinitionIndex() = active_conf->definition_override_index;
-			const auto override_info = game_data::get_weapon_info(active_conf->definition_override_index);
-			if (override_info) {
-				view_model->GetModelIndex() = g_model_info->GetModelIndex(override_info->viewModel);
-			}
-		}
-	}
-}
diff --git a/src/Hooks/Sequence.cpp b/src/Hooks/Sequence.cpp
@@ -566,21 +566,23 @@ void hook_viewmodel(sdk::C_BaseViewModel* thisptr)
 	}
 }
 
+void patch_weapon(sdk::C_BaseAttributableItem* weapon);
 
-void MapSequence(sdk::C_BaseViewModel* view_model) {
+void MapViewModel(sdk::C_BaseViewModel* view_model) {
 	hook_viewmodel(view_model);
 
 	int nSequence = view_model->GetSequence();
 	int newSequence = nSequence;
 	auto& entry = g_weapon_to_org[view_model];
 	int lastSequence = entry.LastSequence;
 	entry.LastSequence = nSequence;
-	int newModelIndex = view_model->GetModelIndex();
+	int modelIndex = view_model->GetModelIndex();
 	int lastModelIndex = entry.LastModelIndex;
-	entry.LastModelIndex = newModelIndex;
+	entry.LastModelIndex = modelIndex;
 
 	const auto view_model_weapon = get_entity_from_handle<sdk::C_BaseAttributableItem>(view_model->GetWeapon());
 	if (view_model_weapon) {
+		patch_weapon(view_model_weapon);
 		const auto weapon_info = game_data::get_weapon_info(view_model_weapon->GetItemDefinitionIndex());
 		if (weapon_info) {
 			const auto definition_index = view_model_weapon->GetItemDefinitionIndex();
@@ -590,8 +592,14 @@ void MapSequence(sdk::C_BaseViewModel* view_model) {
 				if (nullptr != active_conf && 0 != active_conf->definition_override_index) {
 					auto it = g_weapon_to_orgindex.find(view_model_weapon);
 					if (it != g_weapon_to_orgindex.end()) {
+						hook_weapon_update_on_remove(view_model_weapon);
+						auto emplace_result = g_weapon_to_orgindex.emplace(view_model_weapon, definition_index);
+						const auto override_info = game_data::get_weapon_info(active_conf->definition_override_index);
+						if (override_info) {
+							view_model->GetModelIndex() = g_model_info->GetModelIndex(override_info->viewModel);
+						}
 						
-						if (lastSequence != nSequence || entry.LastNewSequence == -1 || newModelIndex != lastModelIndex)
+						if (lastSequence != nSequence || entry.LastNewSequence == -1 || modelIndex != lastModelIndex)
 							newSequence = do_sequence_remapping(it->second, nSequence, active_conf->definition_override_index);
 						else
 							newSequence = entry.LastNewSequence;
@@ -605,9 +613,10 @@ void MapSequence(sdk::C_BaseViewModel* view_model) {
 	view_model->GetSequence() = newSequence;
 }
 
-void UnmapSequence(sdk::C_BaseViewModel* view_model) {
+void UnmapViewModel(sdk::C_BaseViewModel* view_model) {
 	auto it = g_weapon_to_org.find(view_model);
 	if(it != g_weapon_to_org.end()) {
 		view_model->GetSequence() = it->second.LastSequence;
+		view_model->GetModelIndex() = it->second.LastModelIndex;
 	}
 }
diff --git a/src/SDK/CBaseEntity.hpp b/src/SDK/CBaseEntity.hpp
@@ -92,7 +92,7 @@ namespace sdk
 		NETVAR(GetOwner, "CBaseViewModel", "m_hOwner", CBaseHandle);
 		//NETPROP(GetModelIndexProp, "CBaseViewModel", "m_nModelIndex");
 		//NETPROP(GetWeaponProp, "CBaseViewModel", "m_hWeapon");
-		NETPROP(GetSequenceProp, "CBaseViewModel", "m_nSequence");
+		//NETPROP(GetSequenceProp, "CBaseViewModel", "m_nSequence");
 
 		//void SetSequence(int nSequence)
 		//{
diff --git a/src/gui.cpp b/src/gui.cpp
@@ -263,7 +263,7 @@ void draw_gui()
 		ImGui::PopItemWidth();
 		ImGui::Columns(1);
 
-		ImGui::Text("nSkinz by namazso (advancedfx-v0.1.27)");
+		ImGui::Text("nSkinz by namazso (advancedfx-v0.1.30)");
 
 		ImGui::End();
 	}
diff --git a/src/nSkinz.cpp b/src/nSkinz.cpp
@@ -43,8 +43,8 @@ sdk::C_CS_PlayerResource** g_player_resource;
 //vmt_smart_hook*				g_client_hook;
 //vmt_smart_hook*				g_game_event_manager_hook;
 
-//recv_prop_hook* g_modelindex_hook;
-//recv_prop_hook* g_weapon_hook;
+recv_prop_hook* g_modelindex_hook;
+recv_prop_hook* g_weapon_hook;
 recv_prop_hook* g_sequence_hook;
 
 auto ensure_dynamic_hooks() -> void
@@ -81,10 +81,9 @@ void On_FRAME_NET_UPDATE_POSTDATAUPDATE_START(sdk::C_BasePlayer* local);
 
 hooks::IBaseClientDLL_FrameStageNotify::Fn* hooks::IBaseClientDLL_FrameStageNotify::m_original;
 
-void MapSequence(sdk::C_BaseViewModel*view_model);
-void UnmapSequence(sdk::C_BaseViewModel* view_model);
+void MapViewModel(sdk::C_BaseViewModel* view_model);
+void UnmapViewModel(sdk::C_BaseViewModel* view_model);
 void patch_weapon(sdk::C_BaseAttributableItem* weapon);
-void patch_view_model(sdk::C_BaseViewModel* view_model);
 
 auto __fastcall hooks::IBaseClientDLL_FrameStageNotify::hooked(sdk::IBaseClientDLL* thisptr, void*, sdk::ClientFrameStage_t curStage) -> void
 {
@@ -119,6 +118,42 @@ auto __fastcall hooks::IBaseClientDLL_FrameStageNotify::hooked(sdk::IBaseClientD
 				}
 			}
 		}
+	} break;
+	case sdk::FRAME_NET_UPDATE_END:
+	{
+		for (int idx = 0; idx <= g_entity_list->GetMaxEntities(); ++idx)
+		{
+			if (auto ent = g_entity_list->GetClientEntity(idx))
+			{
+				if (auto bent = ent->GetBaseEntity())
+				{
+					const char* className = bent->GetClassname();
+
+					if (0 == strcmp("predicted_viewmodel", className))
+					{
+						auto view_model = static_cast<sdk::C_BaseViewModel*>(bent);
+						MapViewModel(view_model);
+					}
+				}
+			}
+		}
+		m_original(thisptr, nullptr, curStage);
+	} break;
+	case sdk::FRAME_NET_UPDATE_START:
+	{
+		for (int idx = 0; idx <= g_entity_list->GetMaxEntities(); ++idx)
+		{
+			if (auto ent = g_entity_list->GetClientEntity(idx))
+			{
+				if (auto bent = ent->GetBaseEntity())
+				{
+					if (0 == strcmp("predicted_viewmodel", bent->GetClassname()))
+					{
+						UnmapViewModel(static_cast<sdk::C_BaseViewModel*>(bent));
+					}
+				}
+			}
+		}
 		m_original(thisptr, nullptr, curStage);
 	} break;
 	default:
@@ -127,15 +162,6 @@ auto __fastcall hooks::IBaseClientDLL_FrameStageNotify::hooked(sdk::IBaseClientD
 
 }
 
-
-void __cdecl hooks::sequence_proxy_fn(const sdk::CRecvProxyData* proxy_data_const, void* entity, void* output) {
-	auto view_model = static_cast<sdk::C_BaseViewModel*>(entity);
-	patch_view_model(view_model);
-	UnmapSequence(view_model);
-	g_sequence_hook->get_original_function()(proxy_data_const, entity, output);
-	MapSequence(view_model);
-}
-
 auto initialize(void* instance) -> void
 {
 	g_client = get_interface<sdk::IBaseClientDLL>(get_client_name(), CLIENT_DLL_INTERFACE_VERSION);
@@ -169,8 +195,8 @@ 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 squence_prop = sdk::C_BaseViewModel::GetSequenceProp();
-	g_sequence_hook = new recv_prop_hook(squence_prop, &hooks::sequence_proxy_fn);
+	//const auto squence_prop = sdk::C_BaseViewModel::GetSequenceProp();
+	//g_sequence_hook = new recv_prop_hook(squence_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;

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ void draw_gui()`
`263`	`263`	`ImGui::PopItemWidth();`
`264`	`264`	`ImGui::Columns(1);`
`265`	`265`
`266`		`- ImGui::Text("nSkinz by namazso (advancedfx-v0.1.27)");`
	`266`	`+ ImGui::Text("nSkinz by namazso (advancedfx-v0.1.30)");`
`267`	`267`
`268`	`268`	`ImGui::End();`
`269`	`269`	`}`