Prefix all sounds as .wav, since this is the way it's done in the code for all others.
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 16 Apr 2011 00:24:53 +0000 (03:24 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 16 Apr 2011 00:24:53 +0000 (03:24 +0300)
data/qcsrc/server/cl_client.qc
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/vore.qc

index c0b7a5f..a946c85 100644 (file)
@@ -1932,8 +1932,8 @@ void player_regen (void)
 \r
        if (!g_ca && (!g_lms || cvar("g_lms_regenerate")))\r
        {\r
-               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");\r
-               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");\r
+               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");\r
+               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");\r
 \r
                // if player rotted to death...  die!\r
                if(self.health < 1)\r
index 28d8316..09e882f 100644 (file)
@@ -1412,7 +1412,7 @@ void precache()
        precache_sound ("misc/typehit.wav");\r
        precache_sound ("misc/unavailable.wav");\r
        precache_sound ("misc/forbidden.wav");\r
-       precache_sound ("misc/beep.ogg");\r
+       precache_sound ("misc/beep.wav");\r
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));\r
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));\r
     precache_sound ("misc/null.wav");\r
@@ -1423,8 +1423,8 @@ void precache()
     precache_sound ("player/lava.wav");\r
     precache_sound ("player/slime.wav");\r
     precache_sound ("player/digest.wav");\r
-       precache_sound ("misc/health_regen.ogg");\r
-       precache_sound ("misc/armor_regen.ogg");\r
+       precache_sound ("misc/health_regen.wav");\r
+       precache_sound ("misc/armor_regen.wav");\r
 \r
     if (g_jetpack)\r
         precache_sound ("misc/jetpack_fly.wav");\r
@@ -1447,7 +1447,7 @@ void precache()
     precache_sound ("weapons/grabber_fire.wav"); // grabber\r
        precache_sound ("weapons/grabber_altfire.wav"); // grabber\r
     precache_sound ("weapons/grabber_impact.wav"); // grabber\r
-       precache_sound ("weapons/stomachkick.ogg");\r
+       precache_sound ("weapons/stomachkick.wav");\r
 \r
     if (cvar("sv_precacheweapons"))\r
     {\r
index 2c83a71..c4b467e 100644 (file)
@@ -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\r
                if(self.health >= cvar("g_balance_vore_teamheal_stable"))\r
                {\r
-                       play2(self, "misc/beep.ogg");\r
-                       play2(self.predator, "misc/beep.ogg");\r
+                       play2(self, "misc/beep.wav");\r
+                       play2(self.predator, "misc/beep.wav");\r
                }\r
        }\r
 }\r
@@ -396,7 +396,7 @@ void Vore_StomachKick()
                float damage;\r
                damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));\r
                Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force"));\r
-               sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.ogg", VOL_BASE, ATTN_NORM);\r
+               sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);\r
                self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle;\r
 \r
                if(random() < cvar("g_balance_vore_kick_escapeprobability"))\r