From 410a8dd0cf7bf2149e16d52103045ddf0be303e4 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 30 Sep 2010 01:30:19 +0300
Subject: [PATCH] Enable falling sounds
---
data/models/player/vixen.zym.sounds | 2 +-
data/qcsrc/server/defs.qh | 1 +
data/qcsrc/server/sv_main.qc | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
index e8d90be3..d31b6442 100644
--- 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 efe66963..b54fcc7a 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -442,6 +442,7 @@ float next_pingtime;
#define ALLPLAYERSOUNDS \
_VOICEMSG(death) \
_VOICEMSG(drown) \
+ _VOICEMSG(fall) \
_VOICEMSG(gasp) \
_VOICEMSG(swallow) \
_VOICEMSG(digest) \
diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc
index d43d849e..53c8d95f 100644
--- a/data/qcsrc/server/sv_main.qc
+++ b/data/qcsrc/server/sv_main.qc
@@ -77,6 +77,9 @@ void CreatureFrame (void)
if (dm > 0)
{
Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');
+ // this must be allowed to cut the normal pain sounds (played after them and on the same channel)
+ // there's no way to detect falling damage and prevent the pain sounds for this to be played instead
+ PlayerSound(self, playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
}
else if(vlen(self.velocity) > 100000 && cvar("developer"))
{
--
2.39.5