X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftarget%2Fspeaker.qc;h=0b3767ff654c856a13d9e6a515dc13020c5abd4f;hb=541c234fd442f5857209128fc7a907e406f4be03;hp=42cfe3200565b8b09a3e9d05212bcc1e534241d0;hpb=0c81c3002f50a4033a9c06670bd9dd759c54c6f3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/target/speaker.qc b/qcsrc/common/triggers/target/speaker.qc
index 42cfe3200..0b3767ff6 100644
--- a/qcsrc/common/triggers/target/speaker.qc
+++ b/qcsrc/common/triggers/target/speaker.qc
@@ -10,9 +10,9 @@ void target_speaker_use_activator()
 	{
 		var .string sample = GetVoiceMessageSampleField(substring(self.noise, 1, -1));
 		if(GetPlayerSoundSampleField_notFound)
-			snd = "misc/null.wav";
+			snd = SND(Null);
 		else if(activator.(sample) == "")
-			snd = "misc/null.wav";
+			snd = SND(Null);
 		else
 		{
 			tokenize_console(activator.(sample));
@@ -36,9 +36,9 @@ void target_speaker_use_on()
 	{
 		var .string sample = GetVoiceMessageSampleField(substring(self.noise, 1, -1));
 		if(GetPlayerSoundSampleField_notFound)
-			snd = "misc/null.wav";
+			snd = SND(Null);
 		else if(activator.(sample) == "")
-			snd = "misc/null.wav";
+			snd = SND(Null);
 		else
 		{
 			tokenize_console(activator.(sample));
@@ -52,13 +52,13 @@ void target_speaker_use_on()
 	}
 	else
 		snd = self.noise;
-	sound(self, CH_TRIGGER_SINGLE, snd, VOL_BASE * self.volume, self.atten);
+	_sound(self, CH_TRIGGER_SINGLE, snd, VOL_BASE * self.volume, self.atten);
 	if(self.spawnflags & 3)
 		self.use = target_speaker_use_off;
 }
 void target_speaker_use_off()
 {SELFPARAM();
-	sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASE * self.volume, self.atten);
+	sound(self, CH_TRIGGER_SINGLE, SND_Null, VOL_BASE * self.volume, self.atten);
 	self.use = target_speaker_use_on;
 }
 void target_speaker_reset()