]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
The digest sound shall be per-player as well
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 2 Sep 2010 18:47:23 +0000 (21:47 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 2 Sep 2010 18:47:23 +0000 (21:47 +0300)
data/models/player/vixen.zym.sounds
data/qcsrc/server/defs.qh
data/qcsrc/server/vore.qc
data/sound/player/digest.wav [deleted file]
data/sound/player/pyria-skadi/player/digest.wav [new file with mode: 0644]

index 20cd0a5b98f1d44b9fb5cf9424d4f3540601635d..5be4d5d5ce168f2f661dbf547190e7f8a75690eb 100644 (file)
@@ -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
 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
 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
index 8af7677cf2d0cf6b4c891bf07aab0448a4f5ad80..352162d9ff9458991340b209502acd818f6bbd38 100644 (file)
@@ -445,6 +445,7 @@ float next_pingtime;
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
                _VOICEMSG(swallow) \\r
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
                _VOICEMSG(swallow) \\r
+               _VOICEMSG(digest) \\r
                _VOICEMSG(regurgitate) \\r
                _VOICEMSG(regurgitate_prepare) \\r
                _VOICEMSG(gurgle) \\r
                _VOICEMSG(regurgitate) \\r
                _VOICEMSG(regurgitate_prepare) \\r
                _VOICEMSG(gurgle) \\r
index d2e51ce7806a94af2de54bcff9d2fb27c386a6ce..8462b55bb8286cf466556c9077780b6fe6cec232 100644 (file)
@@ -166,7 +166,7 @@ void Vore_Digest()
                if (self.eater.digestsound_finished < time)\r
                {\r
                        self.eater.digestsound_finished = time + 0.5;\r
                if (self.eater.digestsound_finished < time)\r
                {\r
                        self.eater.digestsound_finished = time + 0.5;\r
-                       sound (self.eater, CHAN_PLAYER, "player/digest.wav", VOL_BASE, ATTN_NORM);\r
+                       PlayerSound (self.eater, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);\r
                }\r
                self.eater.digestion_step = time;\r
        }\r
                }\r
                self.eater.digestion_step = time;\r
        }\r
diff --git a/data/sound/player/digest.wav b/data/sound/player/digest.wav
deleted file mode 100644 (file)
index 8d5a28c..0000000
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 (file)
index 0000000..8d5a28c
Binary files /dev/null and b/data/sound/player/pyria-skadi/player/digest.wav differ