Move particle fix to CBaseCombatWeapon::SetViewModel

BSVino · May 20, 2016 · cd08f98 · cd08f98
1 parent 7217287
commit cd08f98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/mp/src/game/shared/basecombatweapon_shared.cpp b/mp/src/game/shared/basecombatweapon_shared.cpp
@@ -1170,6 +1170,9 @@ void CBaseCombatWeapon::SetViewModel()
 	if ( vm == NULL )
 		return;
 	Assert( vm->ViewModelIndex() == m_nViewModelIndex );
+#ifdef CLIENT_DLL
+	vm->ParticleProp()->StopParticlesInvolving(vm);
+#endif
 	vm->SetWeaponModel( GetViewModel( m_nViewModelIndex ), this );
 }
 

diff --git a/mp/src/game/shared/sdk/weapon_sdkbase.cpp b/mp/src/game/shared/sdk/weapon_sdkbase.cpp
@@ -1965,11 +1965,6 @@ bool CWeaponSDKBase::Deploy( )
 
 		if (GetPlayerOwner()->GetCurrentTime() < GetPlayerOwner()->m_flDisarmRedraw)
 			return false;
-
-#ifdef CLIENT_DLL
-		CBaseViewModel* vm = GetPlayerOwner()->GetViewModel( m_nViewModelIndex );
-		vm->ParticleProp()->StopParticlesInvolving(vm);
-#endif
 	}
 
 	bool bDeploy = DefaultDeploy( (char*)GetViewModel(), (char*)GetWorldModel(), GetDeployActivity(), (char*)GetAnimPrefix() );