r5486 - in trunk/data: qcsrc/server sound/weapons

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-10 15:20:08 -0500 (Sat, 10 Jan 2009)
New Revision: 5486

Added:
   trunk/data/sound/weapons/electro_fly.ogg
   trunk/data/sound/weapons/rocket_fly.ogg
   trunk/data/sound/weapons/tag_rocket_fly.ogg
Removed:
   trunk/data/sound/weapons/electro_fly.wav
   trunk/data/sound/weapons/rocket_fly.wav
   trunk/data/sound/weapons/tag_rocket_fly.wav
Modified:
   trunk/data/qcsrc/server/w_electro.qc
Log:
use electro_fly for the secondary, not for the primary
oggenc these wav files
make them looped properly
make electro_fly 25 dB more silent


Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2009-01-10 20:03:46 UTC (rev 5485)
+++ trunk/data/qcsrc/server/w_electro.qc	2009-01-10 20:20:08 UTC (rev 5486)
@@ -15,14 +15,15 @@
 	{
 		pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1);
 		RadiusDamage (self, self.owner, cvar("g_balance_electro_secondary_damage"), cvar("g_balance_electro_secondary_edgedamage"), cvar("g_balance_electro_secondary_radius"), world, cvar("g_balance_electro_secondary_force"), self.projectiledeathtype, other);
+		stopsound (self, CHAN_PAIN);
 	}
 	else
 	{
 		pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1);
 		RadiusDamage (self, self.owner, cvar("g_balance_electro_primary_damage"), cvar("g_balance_electro_primary_edgedamage"), cvar("g_balance_electro_primary_radius"), world, cvar("g_balance_electro_primary_force"), self.projectiledeathtype, other);
+		//stopsound (self, CHAN_PAIN);
 	}
 
-	stopsound (self, CHAN_PAIN);
 	sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
 
 	remove (self);
@@ -112,7 +113,8 @@
 	setmodel(proj, "models/elaser.mdl"); // precision set above
 	setsize(proj, '0 0 0', '0 0 0');
 
-	sound (proj, CHAN_PAIN, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
+	//sound (proj, CHAN_PAIN, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
+	//sounds bad
 }
 
 void W_Electro_Attack2()
@@ -151,6 +153,8 @@
 	proj.health = cvar("g_balance_electro_secondary_health");
 	proj.event_damage = W_Plasma_Damage;
 	proj.flags = FL_PROJECTILE;
+
+	sound (proj, CHAN_PAIN, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
 }
 
 void spawnfunc_weapon_electro (void)

Added: trunk/data/sound/weapons/electro_fly.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/weapons/electro_fly.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/sound/weapons/electro_fly.wav
===================================================================
(Binary files differ)

Added: trunk/data/sound/weapons/rocket_fly.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/weapons/rocket_fly.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/sound/weapons/rocket_fly.wav
===================================================================
(Binary files differ)

Added: trunk/data/sound/weapons/tag_rocket_fly.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/weapons/tag_rocket_fly.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/sound/weapons/tag_rocket_fly.wav
===================================================================
(Binary files differ)