nSkinz advancedfx-v0.1.24

- Fixed sequence not updating when model index changed in some
  conditions (Fixes #34)

Author: dtugend

src/Hooks/PostDataUpdate.cpp

@@ -343,6 +343,4 @@ void On_FRAME_NET_UPDATE_POSTDATAUPDATE_START(sdk::C_BasePlayer* local)
 			}
 		}
 	}
-
-	view_model->ValidateModelIndex();
 }

src/Hooks/Sequence.cpp

@@ -534,6 +534,7 @@ void hook_weapon_update_on_remove(sdk::C_BaseAttributableItem* thisptr);
 vmt_multi_hook* Get_ViewModel_Hook(sdk::C_BaseViewModel* This);
 
 struct OrgModelData_s {
+	int LastModelIndex = -1;
 	int LastSequence = -1;
 	int LastNewSequence = -1;
 };
@@ -574,6 +575,9 @@ void MapSequence(sdk::C_BaseViewModel* view_model) {
 	auto& entry = g_weapon_to_org[view_model];
 	int lastSequence = entry.LastSequence;
 	entry.LastSequence = nSequence;
+	int newModelIndex = view_model->GetModelIndex();
+	int lastModelIndex = entry.LastModelIndex;
+	entry.LastModelIndex = newModelIndex;
 
 	const auto view_model_weapon = get_entity_from_handle<sdk::C_BaseAttributableItem>(view_model->GetWeapon());
 	if (view_model_weapon) {
@@ -587,7 +591,7 @@ void MapSequence(sdk::C_BaseViewModel* view_model) {
 					auto it = g_weapon_to_orgindex.find(view_model_weapon);
 					if (it != g_weapon_to_orgindex.end()) {
 
-						if (lastSequence != nSequence || entry.LastNewSequence == -1)
+						if (lastSequence != nSequence || entry.LastNewSequence == -1 || newModelIndex != lastModelIndex)
 							newSequence = do_sequence_remapping(it->second, nSequence, active_conf->definition_override_index);
 						else
 							newSequence = entry.LastNewSequence;

src/gui.cpp

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

src/nSkinz.cpp

@@ -102,10 +102,6 @@ auto __fastcall hooks::IBaseClientDLL_FrameStageNotify::hooked(sdk::IBaseClientD
 				}
 			}
 		}
-		m_original(thisptr, nullptr, curStage);
-	} break;
-	case sdk::FRAME_RENDER_START:
-	{
 		for (int idx = 0; idx <= g_entity_list->GetMaxEntities(); ++idx)
 		{
 			if (auto ent = g_entity_list->GetClientEntity(idx))
@@ -121,7 +117,7 @@ auto __fastcall hooks::IBaseClientDLL_FrameStageNotify::hooked(sdk::IBaseClientD
 		}
 		m_original(thisptr, nullptr, curStage);
 	} break;
-	case sdk::FRAME_RENDER_END:
+	case sdk::FRAME_NET_UPDATE_START:
 	{
 		for (int idx = 0; idx <= g_entity_list->GetMaxEntities(); ++idx)
 		{