From: MirceaKitsune Date: Thu, 2 Sep 2010 18:47:23 +0000 (+0300) Subject: The digest sound shall be per-player as well X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=aa766c6d351ef88d2601e7a247a6204fdaf0bc55 The digest sound shall be per-player as well --- diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds index 20cd0a5b..5be4d5d5 100644 --- a/data/models/player/vixen.zym.sounds +++ b/data/models/player/vixen.zym.sounds @@ -27,6 +27,7 @@ falling sound/player/pyria-skadi/player/falling 0 gasp sound/player/pyria-skadi/player/gasp 0 jump sound/player/pyria-skadi/player/jump 0 swallow sound/player/pyria-skadi/player/swallow 0 +digest sound/player/pyria-skadi/player/digest 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 diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 8af7677c..352162d9 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -445,6 +445,7 @@ float next_pingtime; _VOICEMSG(drown) \ _VOICEMSG(gasp) \ _VOICEMSG(swallow) \ + _VOICEMSG(digest) \ _VOICEMSG(regurgitate) \ _VOICEMSG(regurgitate_prepare) \ _VOICEMSG(gurgle) \ diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index d2e51ce7..8462b55b 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -166,7 +166,7 @@ void Vore_Digest() if (self.eater.digestsound_finished < time) { self.eater.digestsound_finished = time + 0.5; - sound (self.eater, CHAN_PLAYER, "player/digest.wav", VOL_BASE, ATTN_NORM); + PlayerSound (self.eater, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND); } self.eater.digestion_step = time; } diff --git a/data/sound/player/digest.wav b/data/sound/player/digest.wav deleted file mode 100644 index 8d5a28c1..00000000 Binary files a/data/sound/player/digest.wav and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/digest.wav b/data/sound/player/pyria-skadi/player/digest.wav new file mode 100644 index 00000000..8d5a28c1 Binary files /dev/null and b/data/sound/player/pyria-skadi/player/digest.wav differ