Merge pull request #289 from fortressforever/fixes/weapon-local-sounds

Fix local weapon sounds (like deploy sounds) playing twice on high ping
fortressforever · Jul 3, 2016 · cf60dba · cf60dba · DexterHaslem · Jul 4, 2016
2 parents 815ab2b + f1a27ea
commit cf60dba
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/game_shared/ff/ff_weapon_base.cpp b/game_shared/ff/ff_weapon_base.cpp
@@ -179,6 +179,7 @@ void CFFWeaponBase::WeaponSound(WeaponSound_t sound_type, float soundtime /* = 0
 //----------------------------------------------------------------------------
 void CFFWeaponBase::WeaponSoundLocal( WeaponSound_t sound_type, float soundtime )
 {
+#ifdef CLIENT_DLL 
 	// If we have some sounds from the weapon classname.txt file, play a random one of them
 	const char *shootsound = GetWpnData().aShootSounds[ sound_type ];
 	if( !shootsound || !shootsound[0] )
@@ -191,8 +192,7 @@ void CFFWeaponBase::WeaponSoundLocal( WeaponSound_t sound_type, float soundtime
 
 	CSingleUserRecipientFilter filter( GetPlayerOwner() );
 
-#ifdef CLIENT_DLL 
-	if( GetPlayerOwner() == C_FFPlayer::GetLocalFFPlayer() )
+	if( GetPlayerOwner() == C_FFPlayer::GetLocalFFPlayerOrObserverTarget() )
 	{
 		// Not sure why we're checking tempents... but we did it above^^
 		if( !te->CanPredict() )
@@ -203,9 +203,7 @@ void CFFWeaponBase::WeaponSoundLocal( WeaponSound_t sound_type, float soundtime
 
 		EmitSound( filter, GetPlayerOwner()->entindex(), shootsound, NULL, soundtime );
 	}
-#else
-	EmitSound( filter, GetPlayerOwner()->entindex(), shootsound, NULL, soundtime );
-#endif	
+#endif
 }
 
 //----------------------------------------------------------------------------