Finish the grab sound feature

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index c4480e4ddc54653a6b2f59486eeb9eaab1aa41dd..50f0e43ff982a8f6c4327436e127542101a13fc2 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -335,6 +335,10 @@ void Vore_SwallowStep(entity e)
                return;\r
        }\r
 \r
+       // when the predator starts swallowing, play his grab sound\r
+       if(!self.swallow_progress_pred)\r
+               PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+\r
        Vore_SwallowModel_Update(e, self);\r
 \r
        // increase the progress value until it reaches 1, then swallow the player\r
@@ -641,7 +645,6 @@ void Vore_SetSbarRings()
 }\r
 \r
 .float regurgitatecolor_particles_tick;\r
-.float grabsound;\r
 void Vore()\r
 {\r
        // main vore code, this is where it all happens\r
@@ -759,18 +762,7 @@ void Vore()
                        self.stat_canswallow = 1;\r
 \r
                if(self.BUTTON_ATCK)\r
-               {\r
                        Vore_SwallowStep(prey);\r
-\r
-                       // when the predator starts swallowing, play the grab sound\r
-                       if(!self.grabsound)\r
-                       {\r
-                               PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
-                               self.grabsound = TRUE;\r
-                       }\r
-               }\r
-               else if(self.grabsound)\r
-                       self.grabsound = FALSE; // clear the grab sound\r
        }\r
        else if(prey != world)\r
                self.stat_canswallow = -1;\r

diff --git a/data/sound/player/female/player/grab.ogg b/data/sound/player/female/player/grab.ogg
new file mode 100644 (file)
index 0000000..9f130ad
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 (file)
index 8ff5931..0000000
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 033df879d6d421c6daad9d6551d92689c5eac03d..bb19eed87d8b4115eac2558deb4f823204eb3a02 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -116,8 +116,6 @@
 \r
 - 0.7 | 0.8: Add cubemap reflections for eX and trak5\r
 \r
-- 0.7 | 0.8: Sound when someone is starting to swallow (like getting grabbed or something)\r
-\r
 - 0.7 | 0.8: Maybe find better footstep sounds?\r
 \r
 - 0.7 | 0.8: Bots get stuck with eaten items sometimes.\r