From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 29 Jan 2012 00:05:36 +0000 (+0200)
Subject: Finish the grab sound feature
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba2744be83c77231b1dc18d218486b13d9980040;p=voretournament%2Fvoretournament.git

Finish the grab sound feature
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index c4480e4d..50f0e43f 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -335,6 +335,10 @@ void Vore_SwallowStep(entity e)
 		return;
 	}
 
+	// when the predator starts swallowing, play his grab sound
+	if(!self.swallow_progress_pred)
+		PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
+
 	Vore_SwallowModel_Update(e, self);
 
 	// increase the progress value until it reaches 1, then swallow the player
@@ -641,7 +645,6 @@ void Vore_SetSbarRings()
 }
 
 .float regurgitatecolor_particles_tick;
-.float grabsound;
 void Vore()
 {
 	// main vore code, this is where it all happens
@@ -759,18 +762,7 @@ void Vore()
 			self.stat_canswallow = 1;
 
 		if(self.BUTTON_ATCK)
-		{
 			Vore_SwallowStep(prey);
-
-			// when the predator starts swallowing, play the grab sound
-			if(!self.grabsound)
-			{
-				PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
-				self.grabsound = TRUE;
-			}
-		}
-		else if(self.grabsound)
-			self.grabsound = FALSE; // clear the grab sound
 	}
 	else if(prey != world)
 		self.stat_canswallow = -1;
diff --git a/data/sound/player/female/player/grab.ogg b/data/sound/player/female/player/grab.ogg
new file mode 100644
index 00000000..9f130adf
Binary files /dev/null and b/data/sound/player/female/player/grab.ogg differ
diff --git a/data/sound/player/female/player/grab.wav b/data/sound/player/female/player/grab.wav
deleted file mode 100644
index 8ff59312..00000000
Binary files a/data/sound/player/female/player/grab.wav and /dev/null differ
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 033df879..bb19eed8 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,8 +116,6 @@
 
 - 0.7 | 0.8: Add cubemap reflections for eX and trak5
 
-- 0.7 | 0.8: Sound when someone is starting to swallow (like getting grabbed or something)
-
 - 0.7 | 0.8: Maybe find better footstep sounds?
 
 - 0.7 | 0.8: Bots get stuck with eaten items sometimes.