From d80d402c15a1f1cc77bda54608ddb23b90f4317d Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 16 Apr 2011 03:24:53 +0300 Subject: [PATCH] Prefix all sounds as .wav, since this is the way it's done in the code for all others. --- data/qcsrc/server/cl_client.qc | 4 ++-- data/qcsrc/server/miscfunctions.qc | 8 ++++---- data/qcsrc/server/vore.qc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index c0b7a5f8..a946c854 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1932,8 +1932,8 @@ void player_regen (void) if (!g_ca && (!g_lms || cvar("g_lms_regenerate"))) { - self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.ogg"); - self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.ogg"); + self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.wav"); + self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.wav"); // if player rotted to death... die! if(self.health < 1) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 28d8316f..09e882fb 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1412,7 +1412,7 @@ void precache() precache_sound ("misc/typehit.wav"); precache_sound ("misc/unavailable.wav"); precache_sound ("misc/forbidden.wav"); - precache_sound ("misc/beep.ogg"); + precache_sound ("misc/beep.wav"); PrecacheGlobalSound((globalsound_fall = "misc/hitground 4")); PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4")); precache_sound ("misc/null.wav"); @@ -1423,8 +1423,8 @@ void precache() precache_sound ("player/lava.wav"); precache_sound ("player/slime.wav"); precache_sound ("player/digest.wav"); - precache_sound ("misc/health_regen.ogg"); - precache_sound ("misc/armor_regen.ogg"); + precache_sound ("misc/health_regen.wav"); + precache_sound ("misc/armor_regen.wav"); if (g_jetpack) precache_sound ("misc/jetpack_fly.wav"); @@ -1447,7 +1447,7 @@ void precache() precache_sound ("weapons/grabber_fire.wav"); // grabber precache_sound ("weapons/grabber_altfire.wav"); // grabber precache_sound ("weapons/grabber_impact.wav"); // grabber - precache_sound ("weapons/stomachkick.ogg"); + precache_sound ("weapons/stomachkick.wav"); if (cvar("sv_precacheweapons")) { diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 2c83a711..c4b467ec 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -380,8 +380,8 @@ void Vore_Teamheal() // play beep sound when a team mate was healed to the maximum amount, to both the prey and the predator if(self.health >= cvar("g_balance_vore_teamheal_stable")) { - play2(self, "misc/beep.ogg"); - play2(self.predator, "misc/beep.ogg"); + play2(self, "misc/beep.wav"); + play2(self.predator, "misc/beep.wav"); } } } @@ -396,7 +396,7 @@ void Vore_StomachKick() float damage; damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min")); Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force")); - sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.ogg", VOL_BASE, ATTN_NORM); + sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM); self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle; if(random() < cvar("g_balance_vore_kick_escapeprobability")) -- 2.39.2