From 90b716bd5df363c6f894cd28f5d2eae05c440f66 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 9 Sep 2020 21:29:29 +0200
Subject: [PATCH] env_spark: Use sound shaders instead of hard-coding sfx
 paths.

---
 platform/data.pk3dir/sound/env_spark.sndshd | 10 ++++++++++
 src/gs-entbase/server/env_spark.cpp         | 17 ++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 platform/data.pk3dir/sound/env_spark.sndshd

diff --git a/platform/data.pk3dir/sound/env_spark.sndshd b/platform/data.pk3dir/sound/env_spark.sndshd
new file mode 100644
index 00000000..9e93eede
--- /dev/null
+++ b/platform/data.pk3dir/sound/env_spark.sndshd
@@ -0,0 +1,10 @@
+env_spark.sfx
+{
+	attenuation idle
+	sample buttons/spark1.wav
+	sample buttons/spark2.wav
+	sample buttons/spark3.wav
+	sample buttons/spark4.wav
+	sample buttons/spark5.wav
+	sample buttons/spark6.wav
+}
diff --git a/src/gs-entbase/server/env_spark.cpp b/src/gs-entbase/server/env_spark.cpp
index ca080d06..af9a85bc 100644
--- a/src/gs-entbase/server/env_spark.cpp
+++ b/src/gs-entbase/server/env_spark.cpp
@@ -35,15 +35,6 @@ enumflags
 	EVSPARK_STARTON
 };
 
-string spark_snd[] = {
-	"buttons/spark1.wav",
-	"buttons/spark2.wav",
-	"buttons/spark3.wav",
-	"buttons/spark4.wav",
-	"buttons/spark5.wav",
-	"buttons/spark6.wav"
-};
-
 class env_spark:CBaseTrigger
 {
 	float m_flMaxDelay;
@@ -59,8 +50,7 @@ class env_spark:CBaseTrigger
 void
 env_spark::CreateSpark(void)
 {
-	int r = floor((random() * spark_snd.length));
-	sound(this, CHAN_AUTO, spark_snd[r], 1.0f, ATTN_IDLE);
+	Sound_Play(this, CHAN_AUTO, "env_spark.sfx");
 	FX_Spark(self.origin, self.angles);
 }
 
@@ -123,9 +113,6 @@ env_spark::SpawnKey(string strKey, string strValue)
 void
 env_spark::env_spark(void)
 {
-	for (int i = 0; i < spark_snd.length; i++) {
-		precache_sound(spark_snd[i]);
-	}
-
+	Sound_Precache("env_spark.sfx");
 	CBaseTrigger::CBaseTrigger();
 }