Fix viewmodel related to Gunslinger

redsunservers · Aug 15, 2023 · 781e2cd · 781e2cd
1 parent 281ae0b
commit 781e2cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/addons/sourcemod/scripting/superzombiefortress.sp b/addons/sourcemod/scripting/superzombiefortress.sp
@@ -19,7 +19,7 @@
 
 #include "include/superzombiefortress.inc"
 
-#define PLUGIN_VERSION				"4.6.1"
+#define PLUGIN_VERSION				"4.6.2"
 #define PLUGIN_VERSION_REVISION		"manual"
 
 #define MAX_CONTROL_POINTS	8

diff --git a/addons/sourcemod/scripting/szf/sdkhook.sp b/addons/sourcemod/scripting/szf/sdkhook.sp
@@ -49,10 +49,9 @@ void SDKHook_UnhookClient(int iClient)
 
 public Action Client_Spawn(int iClient)
 {
-	Classes_SetClient(iClient);
-
 	// Reset arms so generated weapons don't get the wrong viewmodel
 	ViewModel_ResetArms(iClient);
+	Classes_SetClient(iClient);
 	return Plugin_Continue;
 }
 

diff --git a/addons/sourcemod/scripting/szf/viewmodel.sp b/addons/sourcemod/scripting/szf/viewmodel.sp
@@ -152,6 +152,9 @@ void ViewModel_RemoveWearable(int iClient)
 
 void ViewModel_ResetArms(int iClient)
 {
+	if (!g_ClientClasses[iClient].bViewModelAnim)
+		return;	// No need to set if we didn't override it to begin with
+
 	TFClassType nClass = TF2_GetPlayerClass(iClient);
 	if (!g_sViewModelsArms[nClass][0])
 		return;