r3411 - in trunk/data: qcsrc/server sound/player

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-02-24 02:58:40 -0500 (Sun, 24 Feb 2008)
New Revision: 3411

Added:
   trunk/data/sound/player/default.sounds.example
Removed:
   trunk/data/sound/player/default.sounds
   trunk/data/sound/player/voice/
Modified:
   trunk/data/qcsrc/server/cl_player.qc
Log:
removed my voice samples, as they were never intended to go into any release and sound bad (with my German accent). I said in the channel weeks ago that I will delete them today, and I am now doing exactly that.


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-02-23 20:28:45 UTC (rev 3410)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-02-24 07:58:40 UTC (rev 3411)
@@ -682,6 +682,27 @@
 		self.last_selected_player = self.selected_player;
 }
 
+float precache_sound_index (string s) = #19;
+void soundto(entity e, entity sounddest, float chan, string samp, float vol, float atten)
+{
+	vector o;
+	if(clienttype(sounddest) != CLIENTTYPE_REAL)
+		return;
+	o = e.origin + 0.5 * (e.mins + e.maxs);
+	msg_entity = sounddest;
+	WriteByte(MSG_ONE, 6);
+	WriteByte(MSG_ONE, 27); // all bits except SND_LOOPING
+	WriteByte(MSG_ONE, vol * 255);
+	WriteByte(MSG_ONE, atten * 64);
+	WriteEntity(MSG_ONE, e);
+	WriteByte(MSG_ONE, chan);
+	WriteShort(MSG_ONE, precache_sound_index(samp));
+	WriteCoord(MSG_ONE, o_x);
+	WriteCoord(MSG_ONE, o_y);
+	WriteCoord(MSG_ONE, o_z);
+}
+
+#if 0
 .string playersound_attack;
 .string playersound_attackinfive;
 .string playersound_coverme;
@@ -790,26 +811,6 @@
 	LoadPlayerSounds(strcat(self.model, ".sounds"));
 }
 
-float precache_sound_index (string s) = #19;
-void soundto(entity e, entity sounddest, float chan, string samp, float vol, float atten)
-{
-	vector o;
-	if(clienttype(sounddest) != CLIENTTYPE_REAL)
-		return;
-	o = e.origin + 0.5 * (e.mins + e.maxs);
-	msg_entity = sounddest;
-	WriteByte(MSG_ONE, 6);
-	WriteByte(MSG_ONE, 27); // all bits except SND_LOOPING
-	WriteByte(MSG_ONE, vol * 255);
-	WriteByte(MSG_ONE, atten * 64);
-	WriteEntity(MSG_ONE, e);
-	WriteByte(MSG_ONE, chan);
-	WriteShort(MSG_ONE, precache_sound_index(samp));
-	WriteCoord(MSG_ONE, o_x);
-	WriteCoord(MSG_ONE, o_y);
-	WriteCoord(MSG_ONE, o_z);
-}
-
 void VoiceMessage(string type)
 {
 	// TODO precache voice messages?
@@ -854,3 +855,8 @@
 				soundto(self, e, CHAN_VOICE, sample, 1, ATTN_NONE);
 	}
 }
+#else
+void PrecachePlayerSounds(string f) { }
+void UpdatePlayerSounds() { }
+void VoiceMessage(string type) { sprint(self, "Sorry, voice command support is not done yet. Maybe later.\n"); }
+#endif

Deleted: trunk/data/sound/player/default.sounds
===================================================================
--- trunk/data/sound/player/default.sounds	2008-02-23 20:28:45 UTC (rev 3410)
+++ trunk/data/sound/player/default.sounds	2008-02-24 07:58:40 UTC (rev 3411)
@@ -1,11 +0,0 @@
-attack sound/player/voice/attack 1
-attackinfive sound/player/voice/attackinfive 1
-coverme sound/player/voice/coverme 1
-defend sound/player/voice/defend 1
-freelance sound/player/voice/freelance 1
-incoming sound/player/voice/incoming 1
-meet sound/player/voice/meet 1
-needhelp sound/player/voice/needhelp 1
-seenflag sound/player/voice/seenflag 2
-taunt sound/player/voice/taunt 9
-teamshoot sound/player/voice/teamshoot 5

Copied: trunk/data/sound/player/default.sounds.example (from rev 3410, trunk/data/sound/player/default.sounds)
===================================================================
--- trunk/data/sound/player/default.sounds.example	                        (rev 0)
+++ trunk/data/sound/player/default.sounds.example	2008-02-24 07:58:40 UTC (rev 3411)
@@ -0,0 +1,11 @@
+attack sound/player/voice/attack 1
+attackinfive sound/player/voice/attackinfive 1
+coverme sound/player/voice/coverme 1
+defend sound/player/voice/defend 1
+freelance sound/player/voice/freelance 1
+incoming sound/player/voice/incoming 1
+meet sound/player/voice/meet 1
+needhelp sound/player/voice/needhelp 1
+seenflag sound/player/voice/seenflag 2
+taunt sound/player/voice/taunt 9
+teamshoot sound/player/voice/teamshoot 5