From 8e9a7027eb962e7a1b23fa1d8494436a1235d477 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 5 Nov 2008 20:26:40 +0000
Subject: [PATCH] add the new stuff to default.sounds

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4993 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/cl_player.qc   | 10 +++++++++-
 data/qcsrc/server/defs.qh        |  1 -
 data/sound/player/default.sounds | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index ff7efcc3e..0b24a566a 100644
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -764,7 +764,7 @@ float GetVoiceMessageTeamsayType(string type)
 	return 1;
 }
 
-string allvoicesamples = "attack attackinfive coverme defend freelance incoming meet needhelp seenflag taunt teamshoot";
+string allvoicesamples;
 float GetPlayerSoundSampleField_notFound;
 float GetPlayerSoundSampleField_fixed;
 .string GetVoiceMessageSampleField(string type)
@@ -830,6 +830,14 @@ void PrecachePlayerSounds(string f)
 		PrecacheGlobalSound(strcat(argv(1), " ", argv(2)));
 	}
 	fclose(fh);
+
+	if not(allvoicesamples)
+	{
+#define _VOICEMSG(m) allvoicesamples = strcat(allvoicesamples, " ", #m);
+		ALLVOICEMSGS
+#undef _VOICEMSG
+		allvoicesamples = strzone(substring(allvoicesamples, 1, strlen(allvoicesamples) - 1));
+	}
 }
 
 void ClearPlayerSounds()
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 12998a1b0..239ab1780 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -470,7 +470,6 @@ float next_pingtime;
 		_VOICEMSG(seenenemy) \
 		_VOICEMSG(getflag) \
 		_VOICEMSG(droppedflag) \
-		_VOICEMSG(getourflagback) \
 		_VOICEMSG(flagcarriertakingdamage)
 #define _VOICEMSG(m) .string playersound_##m;
 ALLPLAYERSOUNDS
diff --git a/data/sound/player/default.sounds b/data/sound/player/default.sounds
index 4391ee044..eb23e578c 100644
--- a/data/sound/player/default.sounds
+++ b/data/sound/player/default.sounds
@@ -1,16 +1,27 @@
+//affirmative sound/player/torus/affirmative 0
 attack sound/player/torus/attack 0
+//attacking sound/player/torus/attacking 0
 attackinfive sound/player/torus/letsgo 0
 coverme sound/player/torus/coverme 0
 //defend sound/player/voice/defend 1
+//defending sound/player/torus/defending 0
+//droppedflag sound/player/voice/droppedflag 0
+//flagcarriertakingdamage sound/player/voice/flagcarriertakingdamage 0
 //freelance sound/player/voice/freelance 1
+//getflag sound/player/voice/getflag 0
 incoming sound/player/torus/incoming 0
 meet sound/player/torus/waypoint 0
 needhelp sound/player/torus/needhelp 0
+//negative sound/player/torus/negative 0
+//onmyway sound/player/torus/onmyway 0
+//roaming sound/player/torus/roaming 0
 seenflag sound/player/torus/flagseen 0
+seenenemy sound/player/torus/seenenemy 0
 taunt sound/player/torus/taunt 0
 teamshoot sound/player/torus/teamshoot 0
 death sound/player/torus/death 0
 drown sound/player/torus/drown 0
+//fall sound/debug/v_falling 0
 //falling sound/debug/v_falling 0
 gasp sound/player/torus/gasp 0
 jump sound/player/torus/jump 0
-- 
2.39.2