From 9b6ce936009f5a171e1d8ff2227e1db54a1670d2 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 2 Sep 2010 21:27:12 +0300
Subject: [PATCH] Make gurgle sound per-player

---
 data/models/player/vixen.zym.sounds                 |   1 +
 data/qcsrc/server/cl_player.qc                      |   6 ++++++
 data/qcsrc/server/defs.qh                           |   2 ++
 data/qcsrc/server/vore.qc                           |   9 +--------
 .../player/{ => pyria-skadi/player}/gurgle.ogg      | Bin
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename data/sound/player/{ => pyria-skadi/player}/gurgle.ogg (100%)

diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
index 457e898a..20cd0a5b 100644
--- a/data/models/player/vixen.zym.sounds
+++ b/data/models/player/vixen.zym.sounds
@@ -29,6 +29,7 @@ jump sound/player/pyria-skadi/player/jump 0
 swallow sound/player/pyria-skadi/player/swallow 0
 regurgitate sound/player/pyria-skadi/player/regurgitate 0
 regurgitate_prepare sound/player/pyria-skadi/player/regurgitate_prepare 0
+gurgle sound/player/pyria-skadi/player/gurgle 0
 pain25 sound/player/pyria-skadi/player/pain25 0
 pain50 sound/player/pyria-skadi/player/pain50 0
 pain75 sound/player/pyria-skadi/player/pain75 0
diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index eeb17956..88020455 100644
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -1292,6 +1292,12 @@ void GlobalSound(string sample, float chan, float voicetype)
 		case VOICETYPE_PLAYERSOUND:
 			sound(self, chan, sample, VOL_BASE, ATTN_NORM);
 			break;
+		case VOICETYPE_GURGLE:
+			if(self.stomach_load)
+				sound(self, chan, sample, VOL_BASE * self.stomach_load / cvar("g_balance_vore_swallow_limit"), ATTN_NORM);
+			else
+				stopsound(self, chan);
+			break;
 		default:
 			backtrace("Invalid voice type!");
 			break;
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 91fc21e2..8af7677c 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -447,6 +447,7 @@ float next_pingtime;
 		_VOICEMSG(swallow) \
 		_VOICEMSG(regurgitate) \
 		_VOICEMSG(regurgitate_prepare) \
+		_VOICEMSG(gurgle) \
 		_VOICEMSG(jump) \
 		_VOICEMSG(pain25) \
 		_VOICEMSG(pain50) \
@@ -495,6 +496,7 @@ string globalsound_metalstep;
 #define VOICETYPE_LASTATTACKER_ONLY 13
 #define VOICETYPE_AUTOTAUNT 14
 #define VOICETYPE_TAUNT 15
+#define VOICETYPE_GURGLE 16
 
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index b43a4db2..d2e51ce7 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -219,14 +219,7 @@ void Vore_Gurglesound()
 {
 	if(time > self.gurglesound_finished || self.gurglesound_oldstomachload != self.stomach_load)
 	{
-		local float vol;
-		vol = VOL_BASE * self.stomach_load / cvar("g_balance_vore_swallow_limit");
-
-		precache_sound("player/gurgle.ogg");
-		if(self.stomach_load)
-			sound (self, CHAN_TRIGGER, "player/gurgle.ogg", vol, ATTN_NORM);
-		else
-			stopsound(self, CHAN_TRIGGER);
+		GlobalSound(self.playersound_gurgle, CHAN_TRIGGER, VOICETYPE_GURGLE);
 
 		self.gurglesound_finished = time + 11; // yes, hard coded sound length. I know it's bad but what can I do?
 		self.gurglesound_oldstomachload = self.stomach_load;
diff --git a/data/sound/player/gurgle.ogg b/data/sound/player/pyria-skadi/player/gurgle.ogg
similarity index 100%
rename from data/sound/player/gurgle.ogg
rename to data/sound/player/pyria-skadi/player/gurgle.ogg
-- 
2.39.2