r4998 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Nov 6 08:35:07 EST 2008
Author: div0
Date: 2008-11-06 08:35:07 -0500 (Thu, 06 Nov 2008)
New Revision: 4998
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/portals.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
trunk/data/qcsrc/server/w_minstanex.qc
trunk/data/qcsrc/server/w_nex.qc
trunk/data/qcsrc/server/w_porto.qc
Log:
fix the sound madness once and for all: change ogg to wav everywhere
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -914,7 +914,7 @@
if(clienttype(self.owner) == CLIENTTYPE_REAL)
{
if(self.cnt <= 10)
- announce(self.owner, strcat("announcer/robotic/", ftos(self.cnt), ".ogg"));
+ announce(self.owner, strcat("announcer/robotic/", ftos(self.cnt), ".wav"));
if(self.owner.killindicator_teamchange)
{
if(self.owner.killindicator_teamchange == -1)
@@ -1808,7 +1808,7 @@
{
self.respawn_countdown = number - 1;
if(ceil(self.death_time - (time + 0.5)) == number) // only say it if it is the same number even in 0.5s; to prevent overlapping sounds
- announce(self, strcat("announcer/robotic/", ftos(number), ".ogg"));
+ announce(self, strcat("announcer/robotic/", ftos(number), ".wav"));
}
}
}
@@ -2280,7 +2280,7 @@
if(timeleft <= 0)
{
bprint("^3", self.netname, "^3 was kicked for idling.\n");
- announce(self, "announcer/robotic/terminated.ogg");
+ announce(self, "announcer/robotic/terminated.wav");
dropclient(self);
return;
}
@@ -2289,7 +2289,7 @@
if(timeleft != self.idlekick_lasttimeleft)
{
centerprint_atprio(self, CENTERPRIO_IDLEKICK, strcat("^3Stop idling!\n^3Disconnecting in ", ftos(timeleft), "..."));
- announce(self, strcat("announcer/robotic/", ftos(timeleft), ".ogg"));
+ announce(self, strcat("announcer/robotic/", ftos(timeleft), ".wav"));
}
}
else
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/clientcommands.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -618,7 +618,7 @@
}
if(f <= 3) {
- play2all(strcat("announcer/robotic/", ftos(f), ".ogg"));
+ play2all(strcat("announcer/robotic/", ftos(f), ".wav"));
}
self.nextthink = game_starttime - (f - 1);
}
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/g_damage.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -465,7 +465,7 @@
bprint ("^1",s, "^1 died\n");
GiveFrags(targ, targ, -1);
if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) {
- announce(targ, "announcer/male/botlike.ogg");
+ announce(targ, "announcer/male/botlike.wav");
}
if (targ.killcount > 2)
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -1165,9 +1165,9 @@
precache_sound ("announcer/male/25kills.wav");
precache_sound ("announcer/male/30kills.wav");
precache_sound ("announcer/male/botlike.wav");
- precache_sound ("announcer/male/yoda.ogg");
- precache_sound ("announcer/male/headshot.ogg");
- precache_sound ("announcer/male/impressive.ogg");
+ precache_sound ("announcer/male/yoda.wav");
+ precache_sound ("announcer/male/headshot.wav");
+ precache_sound ("announcer/male/impressive.wav");
// announcer sounds - robotic
precache_sound ("announcer/robotic/prepareforbattle.wav");
@@ -1193,16 +1193,16 @@
precache_model ("models/sprites/8.spr32");
precache_model ("models/sprites/9.spr32");
precache_model ("models/sprites/10.spr32");
- precache_sound ("announcer/robotic/1.ogg");
- precache_sound ("announcer/robotic/2.ogg");
- precache_sound ("announcer/robotic/3.ogg");
- precache_sound ("announcer/robotic/4.ogg");
- precache_sound ("announcer/robotic/5.ogg");
- precache_sound ("announcer/robotic/6.ogg");
- precache_sound ("announcer/robotic/7.ogg");
- precache_sound ("announcer/robotic/8.ogg");
- precache_sound ("announcer/robotic/9.ogg");
- precache_sound ("announcer/robotic/10.ogg");
+ precache_sound ("announcer/robotic/1.wav");
+ precache_sound ("announcer/robotic/2.wav");
+ precache_sound ("announcer/robotic/3.wav");
+ precache_sound ("announcer/robotic/4.wav");
+ precache_sound ("announcer/robotic/5.wav");
+ precache_sound ("announcer/robotic/6.wav");
+ precache_sound ("announcer/robotic/7.wav");
+ precache_sound ("announcer/robotic/8.wav");
+ precache_sound ("announcer/robotic/9.wav");
+ precache_sound ("announcer/robotic/10.wav");
// common weapon precaches
precache_sound ("weapons/weapon_switch.wav");
Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/portals.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -425,14 +425,14 @@
if(killed)
{
fixedmakevectors(portal.angles);
- sound(portal, CHAN_PROJECTILE, "porto/explode.ogg", VOL_BASE, ATTN_NORM);
+ sound(portal, CHAN_PROJECTILE, "porto/explode.wav", VOL_BASE, ATTN_NORM);
pointparticles(particleeffectnum("rocket_explode"), portal.origin + v_forward * 16, v_forward * 1024, 4);
remove(portal);
}
else
{
Portal_MakeBrokenPortal(portal);
- sound(portal, CHAN_PROJECTILE, "porto/expire.ogg", VOL_BASE, ATTN_NORM);
+ sound(portal, CHAN_PROJECTILE, "porto/expire.wav", VOL_BASE, ATTN_NORM);
SUB_SetFade(portal, time, 0.5);
}
}
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/t_items.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -64,12 +64,12 @@
// play some cool sounds ;)
centerprint(player, "\n");
if(player.health <= 5)
- announce(player, "announcer/robotic/lastsecond.ogg");
+ announce(player, "announcer/robotic/lastsecond.wav");
else if(player.health < 50)
- announce(player, "announcer/robotic/narrowly.ogg");
+ announce(player, "announcer/robotic/narrowly.wav");
// sound not available
// else if(item.items == IT_CELLS)
- // play2(player, "announce/robotic/ammo.ogg");
+ // play2(player, "announce/robotic/ammo.wav");
if (item.weapons & WEPBIT_MINSTANEX)
W_GiveWeapon (player, WEP_MINSTANEX, "Nex");
@@ -83,7 +83,7 @@
{
pickedup = TRUE;
// sound not available
- // play2(player, "announce/robotic/extra.ogg\nplay2 announce/robotic/_lives.ogg");
+ // play2(player, "announce/robotic/extra.ogg\nplay2 announce/robotic/_lives.wav");
player.armorvalue = player.armorvalue + cvar("g_minstagib_extralives");
sprint(player, "^3You picked up some extra lives\n");
}
@@ -93,7 +93,7 @@
{
pickedup = TRUE;
// sound not available
- // play2(player, "announce/robotic/invisible.ogg");
+ // play2(player, "announce/robotic/invisible.wav");
player.strength_finished = max(player.strength_finished, time) + cvar("g_balance_powerup_strength_time");
}
@@ -102,7 +102,7 @@
{
pickedup = TRUE;
// sound not available
- // play2(player, "announce/robotic/speed.ogg");
+ // play2(player, "announce/robotic/speed.wav");
player.invincible_finished = max(player.invincible_finished, time) + cvar("g_balance_powerup_strength_time");
}
}
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/w_electro.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -8,7 +8,7 @@
if(other.classname == "player")
if(IsDifferentTeam(self.owner, other))
if(IsFlying(other))
- announce(self.owner, "announcer/male/electrobitch.ogg");
+ announce(self.owner, "announcer/male/electrobitch.wav");
self.event_damage = SUB_Null;
if (self.movetype == MOVETYPE_BOUNCE)
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -9,7 +9,7 @@
if(other.classname == "player")
if(IsDifferentTeam(self.owner, other))
if(IsFlying(other))
- announce(self.owner, "announcer/male/airshot.ogg");
+ announce(self.owner, "announcer/male/airshot.wav");
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other);
@@ -31,7 +31,7 @@
if(other.classname == "player")
if(IsDifferentTeam(self.owner, other))
if(IsFlying(other))
- announce(self.owner, "announcer/male/airshot.ogg");
+ announce(self.owner, "announcer/male/airshot.wav");
remove (self);
}
Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/w_minstanex.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -15,20 +15,20 @@
if(g_minstagib)
{
if(yoda)
- announce(self, "announcer/male/yoda.ogg");
+ announce(self, "announcer/male/yoda.wav");
}
else
{
if(yoda && flying)
- announce(self, "announcer/male/yoda.ogg");
+ announce(self, "announcer/male/yoda.wav");
if(headshot)
{
- announce(self, "announcer/male/headshot.ogg");
+ announce(self, "announcer/male/headshot.wav");
print("h\n");
}
if(damage_goodhits && self.minstanex_lasthit)
{
- if(announce(self, "announcer/male/impressive.ogg"))
+ if(announce(self, "announcer/male/impressive.wav"))
damage_goodhits = 0; // only every second time
}
}
@@ -67,67 +67,67 @@
{
centerprint(self, "you're dead now...\n");
Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/terminated.ogg");
+ announce(self, "announcer/robotic/terminated.wav");
}
if (self.health == 10)
{
centerprint(self, "^11^7 second left to find some ammo\n");
Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/1.ogg");
+ announce(self, "announcer/robotic/1.wav");
}
if (self.health == 20)
{
centerprint(self, "^12^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/2.ogg");
+ announce(self, "announcer/robotic/2.wav");
}
if (self.health == 30)
{
centerprint(self, "^13^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/3.ogg");
+ announce(self, "announcer/robotic/3.wav");
}
if (self.health == 40)
{
centerprint(self, "^14^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/4.ogg");
+ announce(self, "announcer/robotic/4.wav");
}
if (self.health == 50)
{
centerprint(self, "^15^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/5.ogg");
+ announce(self, "announcer/robotic/5.wav");
}
if (self.health == 60)
{
centerprint(self, "^36^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/6.ogg");
+ announce(self, "announcer/robotic/6.wav");
}
if (self.health == 70)
{
centerprint(self, "^37^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/7.ogg");
+ announce(self, "announcer/robotic/7.wav");
}
if (self.health == 80)
{
centerprint(self, "^38^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/8.ogg");
+ announce(self, "announcer/robotic/8.wav");
}
if (self.health == 90)
{
centerprint(self, "^39^7 seconds left to find some ammo\n");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/9.ogg");
+ announce(self, "announcer/robotic/9.wav");
}
if (self.health == 100)
{
centerprint(self, "get some ammo or\nyou'll be dead in ^310^7 seconds...");
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
- announce(self, "announcer/robotic/10.ogg");
+ announce(self, "announcer/robotic/10.wav");
}
}
self.minstagib_nextthink = time + 1;
Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/w_nex.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -9,7 +9,7 @@
FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), WEP_NEX);
if(yoda && flying)
- announce(self, "announcer/male/yoda.ogg");
+ announce(self, "announcer/male/yoda.wav");
pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc 2008-11-06 13:27:17 UTC (rev 4997)
+++ trunk/data/qcsrc/server/w_porto.qc 2008-11-06 13:35:07 UTC (rev 4998)
@@ -91,19 +91,19 @@
if(self.owner.playerid != self.playerid)
{
- sound(self, CHAN_PROJECTILE, "porto/unsupported.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
remove(self);
}
else if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK || trace_dphitcontents & DPCONTENTS_PLAYERCLIP)
{
- sound(self, CHAN_PROJECTILE, "porto/bounce.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/bounce.wav", VOL_BASE, ATTN_NORM);
// just reflect
self.right_vector = self.right_vector - 2 * trace_plane_normal * (self.right_vector * trace_plane_normal);
self.angles = vectoangles(self.velocity - 2 * trace_plane_normal * (self.velocity * trace_plane_normal));
}
else if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
{
- sound(self, CHAN_PROJECTILE, "porto/unsupported.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
W_Porto_Fail(0);
}
else if(self.effects & EF_RED)
@@ -111,7 +111,7 @@
self.effects += EF_BLUE - EF_RED;
if(Portal_SpawnInPortalAtTrace(self.owner, self.right_vector, self.portal_id))
{
- sound(self, CHAN_PROJECTILE, "porto/create.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/create.wav", VOL_BASE, ATTN_NORM);
trace_plane_normal = norm;
centerprint(self.owner, "^1In^7-portal created.\n");
self.right_vector = self.right_vector - 2 * trace_plane_normal * (self.right_vector * norm);
@@ -119,7 +119,7 @@
}
else
{
- sound(self, CHAN_PROJECTILE, "porto/unsupported.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
trace_plane_normal = norm;
W_Porto_Fail(0);
}
@@ -130,20 +130,20 @@
{
if(Portal_SpawnOutPortalAtTrace(self.owner, self.right_vector, self.portal_id))
{
- sound(self, CHAN_PROJECTILE, "porto/create.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/create.wav", VOL_BASE, ATTN_NORM);
trace_plane_normal = norm;
centerprint(self.owner, "^4Out^7-portal created.\n");
W_Porto_Success();
}
else
{
- sound(self, CHAN_PROJECTILE, "porto/unsupported.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
W_Porto_Fail(0);
}
}
else
{
- sound(self, CHAN_PROJECTILE, "porto/unsupported.ogg", VOL_BASE, ATTN_NORM);
+ sound(self, CHAN_PROJECTILE, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
W_Porto_Fail(0);
}
}
@@ -156,7 +156,7 @@
if not(self.items & IT_UNLIMITED_SUPERWEAPONS)
self.weapons = self.weapons - (self.weapons & WEPBIT_PORTO);
- W_SetupShot (self, '0 0 0', FALSE, 4, "porto/fire.ogg");
+ W_SetupShot (self, '0 0 0', FALSE, 4, "porto/fire.wav");
//pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -264,12 +264,12 @@
precache_model ("models/weapons/v_porto.md3");
precache_model ("models/weapons/w_porto.zym");
precache_model ("models/portal.md3");
- precache_sound ("porto/bounce.ogg");
- precache_sound ("porto/create.ogg");
- precache_sound ("porto/expire.ogg");
- precache_sound ("porto/explode.ogg");
- precache_sound ("porto/fire.ogg");
- precache_sound ("porto/unsupported.ogg");
+ precache_sound ("porto/bounce.wav");
+ precache_sound ("porto/create.wav");
+ precache_sound ("porto/expire.wav");
+ precache_sound ("porto/explode.wav");
+ precache_sound ("porto/fire.wav");
+ precache_sound ("porto/unsupported.wav");
}
else if (req == WR_SETUP)
weapon_setup(WEP_PORTO);
More information about the nexuiz-commits
mailing list