Enable falling sounds

diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
index e8d90be3a50899eb7de8a4b04d05717771840b98..d31b64426712cb5dbf0a1b06feb7155169a4a5ad 100644 (file)
--- a/data/models/player/vixen.zym.sounds
+++ b/data/models/player/vixen.zym.sounds
@@ -22,7 +22,7 @@ taunt sound/player/female/coms/taunt 5
 teamshoot sound/player/female/coms/teamshoot 4
 death sound/player/female/player/death 3
 drown sound/player/female/player/drown 0
-fall sound/player/female/player/fall 0
+fall sound/player/female/player/fall 1
 falling sound/player/female/player/falling 0
 gasp sound/player/female/player/gasp 0
 jump sound/player/female/player/jump 0

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index efe6696391a26f4e7378f9d89283f0e35e0af0ff..b54fcc7a2476b40c044bad79d1561e639e4ed004 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -442,6 +442,7 @@ float next_pingtime;
 #define ALLPLAYERSOUNDS \\r
                _VOICEMSG(death) \\r
                _VOICEMSG(drown) \\r
+               _VOICEMSG(fall) \\r
                _VOICEMSG(gasp) \\r
                _VOICEMSG(swallow) \\r
                _VOICEMSG(digest) \\r

diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc
index d43d849ee32afc92bc3e6a5a2ec80188a98ad856..53c8d95f18daa06acf1a3eebec8d4bc0a17029cf 100644 (file)
--- a/data/qcsrc/server/sv_main.qc
+++ b/data/qcsrc/server/sv_main.qc
@@ -77,6 +77,9 @@ void CreatureFrame (void)
                                if (dm > 0)\r
                                {\r
                                        Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');\r
+                                       // this must be allowed to cut the normal pain sounds (played after them and on the same channel)\r
+                                       // there's no way to detect falling damage and prevent the pain sounds for this to be played instead\r
+                                       PlayerSound(self, playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
                                }\r
                                else if(vlen(self.velocity) > 100000 && cvar("developer"))\r
                                {\r