From: terencehill <piuntn@gmail.com>
Date: Tue, 15 Dec 2020 13:48:44 +0000 (+0100)
Subject: Default cl_hitsound to 1 (fixed sound) if it isn't set to a standard value (0 1 2 3)
X-Git-Tag: xonotic-v0.8.5~640
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7f02455f5bb234c45c492fbfefa7bf59a65de17;p=xonotic%2Fxonotic-data.pk3dir.git

Default cl_hitsound to 1 (fixed sound) if it isn't set to a standard value (0 1 2 3)
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index f39dbbefc..8b1314663 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -809,22 +809,22 @@ void HitSound()
 	{
 		if (autocvar_cl_hitsound && unaccounted_damage)
 		{
-			// customizable gradient function that crosses (0,a), (c,1) and asymptotically approaches b
-			float a = autocvar_cl_hitsound_max_pitch;
-			float b = autocvar_cl_hitsound_min_pitch;
-			float c = autocvar_cl_hitsound_nom_damage;
-			float d = unaccounted_damage;
-			float pitch_shift = (b*d*(a-1) + a*c*(1-b)) / (d*(a-1) + c*(1-b));
-
-			// if sound variation is disabled, set pitch_shift to 1
-			if (autocvar_cl_hitsound == 1)
-				pitch_shift = 1;
-
-			// if pitch shift is reversed, mirror in (max-min)/2 + min
-			if (autocvar_cl_hitsound == 3)
+			float pitch_shift = 1;
+			if (autocvar_cl_hitsound == 2 || autocvar_cl_hitsound == 3)
 			{
-				float mirror_value = (a-b)/2 + b;
-				pitch_shift = mirror_value + (mirror_value - pitch_shift);
+				// customizable gradient function that crosses (0,a), (c,1) and asymptotically approaches b
+				float a = autocvar_cl_hitsound_max_pitch;
+				float b = autocvar_cl_hitsound_min_pitch;
+				float c = autocvar_cl_hitsound_nom_damage;
+				float d = unaccounted_damage;
+				pitch_shift = (b*d*(a-1) + a*c*(1-b)) / (d*(a-1) + c*(1-b));
+
+				// if pitch shift is reversed, mirror in (max-min)/2 + min
+				if (autocvar_cl_hitsound == 3)
+				{
+					float mirror_value = (a-b)/2 + b;
+					pitch_shift = mirror_value + (mirror_value - pitch_shift);
+				}
 			}
 
 			//LOG_TRACE("dmg total (dmg): ", ftos(unaccounted_damage), " , pitch shift: ", ftos(pitch_shift));