From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Wed, 18 Jan 2023 12:07:42 +0000 (+0100)
Subject: strafehud: make sonar sound interval dynamic too
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbf65ae0dc50efcf8366a3d54d836c94b7fde46f;p=xonotic%2Fxonotic-data.pk3dir.git

strafehud: make sonar sound interval dynamic too
---

diff --git a/_hud_common.cfg b/_hud_common.cfg
index a854eec1e..655dae3d5 100644
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -212,7 +212,8 @@ seta hud_panel_strafehud_fps_update "0.5" "update interval (in seconds) of the f
 seta hud_panel_strafehud_sonar "0" "set to \"1\" to enable the strafe sonar"
 seta hud_panel_strafehud_sonar_audio "misc/talk" "audio to play for sonar"
 seta hud_panel_strafehud_sonar_start "0.5" "how optimal from 0 to 1 your strafing angle has to be for the strafe sonar to activate"
-seta hud_panel_strafehud_sonar_interval "0.333333" "strafe sonar sound interval in seconds"
+seta hud_panel_strafehud_sonar_interval_start "0.333333" "strafe sonar sound interval in seconds"
+seta hud_panel_strafehud_sonar_interval_range "-0.222222" "dynamic sound interval range in seconds of the strafe sonar as you approach the optimal angle"
 seta hud_panel_strafehud_sonar_volume_start "0.333333" "sound volume of the strafe sonar"
 seta hud_panel_strafehud_sonar_volume_range "0.666666" "dynamic volume range of the strafe sonar as you approach the optimal angle"
 seta hud_panel_strafehud_sonar_pitch_start "0.9" "playback speed of the strafe sonar"
diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc
index e0f6a0573..e6f03dfa1 100644
--- a/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@ -928,29 +928,29 @@ void HUD_StrafeHUD()
 
 			// reuse strafe ratio for strafe sonar
 			static float sonar_time = 0;
-			bool sonar_ready = ((time - sonar_time) >= autocvar_hud_panel_strafehud_sonar_interval) || (sonar_time == 0);
-			if(autocvar_hud_panel_strafehud_sonar && sonar_ready)
-			{
-				float sonar_start = bound(0, autocvar_hud_panel_strafehud_sonar_start, 1);
-				if(strafe_ratio >= sonar_start)
-				{
-					sonar_time = time;
 
-					float sonar_ratio = strafe_ratio - sonar_start;
-					if(sonar_start != 1)
-						sonar_ratio /= 1 - sonar_start;
-					else
-						sonar_ratio = 1;
+			float sonar_start = bound(0, autocvar_hud_panel_strafehud_sonar_start, 1);
+			float sonar_ratio = strafe_ratio - sonar_start;
+			if(sonar_start != 1)
+				sonar_ratio /= 1 - sonar_start;
+			else
+				sonar_ratio = 1;
 
-					float sonar_volume = bound(0, autocvar_hud_panel_strafehud_sonar_volume_start, 1);
-					sonar_volume += autocvar_hud_panel_strafehud_sonar_volume_range * sonar_ratio;
+			float sonar_interval = max(0, autocvar_hud_panel_strafehud_sonar_interval_start);
+			sonar_interval += autocvar_hud_panel_strafehud_sonar_interval_range * sonar_ratio;
+			bool sonar_ready = (sonar_time == 0) || ((time - sonar_time) >= sonar_interval);
+			if(autocvar_hud_panel_strafehud_sonar && sonar_ready && (strafe_ratio >= sonar_start))
+			{
+				sonar_time = time;
 
-					float sonar_pitch = max(0, autocvar_hud_panel_strafehud_sonar_pitch_start);
-					sonar_pitch += autocvar_hud_panel_strafehud_sonar_pitch_range * sonar_ratio;
+				float sonar_volume = bound(0, autocvar_hud_panel_strafehud_sonar_volume_start, 1);
+				sonar_volume += autocvar_hud_panel_strafehud_sonar_volume_range * sonar_ratio;
 
-					if(sonar_volume > 0)
-						sound7(csqcplayer, CH_INFO, sonarsound, bound(0, sonar_volume, 1) * VOL_BASE, ATTN_NONE, max(0.000001, sonar_pitch * 100), 0);
-				}
+				float sonar_pitch = max(0, autocvar_hud_panel_strafehud_sonar_pitch_start);
+				sonar_pitch += autocvar_hud_panel_strafehud_sonar_pitch_range * sonar_ratio;
+
+				if(sonar_volume > 0)
+					sound7(csqcplayer, CH_INFO, sonarsound, bound(0, sonar_volume, 1) * VOL_BASE, ATTN_NONE, max(0.000001, sonar_pitch * 100), 0);
 			}
 		}
 
diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh
index 81836ae19..ba5ae58f6 100644
--- a/qcsrc/client/hud/panel/strafehud.qh
+++ b/qcsrc/client/hud/panel/strafehud.qh
@@ -61,7 +61,8 @@ float autocvar_hud_panel_strafehud_fps_update = 0.5;
 bool autocvar_hud_panel_strafehud_sonar = false;
 string autocvar_hud_panel_strafehud_sonar_audio = "misc/talk";
 float autocvar_hud_panel_strafehud_sonar_start = 0.5;
-float autocvar_hud_panel_strafehud_sonar_interval = 0.333333;
+float autocvar_hud_panel_strafehud_sonar_interval_start = 0.333333;
+float autocvar_hud_panel_strafehud_sonar_interval_range = -0.222222;
 float autocvar_hud_panel_strafehud_sonar_volume_start = 0.333333;
 float autocvar_hud_panel_strafehud_sonar_volume_range = 0.666666;
 float autocvar_hud_panel_strafehud_sonar_pitch_start = 0.9;