r5616 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-19 04:37:16 -0500 (Mon, 19 Jan 2009)
New Revision: 5616

Modified:
   trunk/data/qcsrc/client/damage.qc
   trunk/data/qcsrc/client/projectile.qc
Log:
fix the weapons/rick1.wav sounds (instant rickroll... sorry, ricochets)


Modified: trunk/data/qcsrc/client/damage.qc
===================================================================
--- trunk/data/qcsrc/client/damage.qc	2009-01-19 09:20:54 UTC (rev 5615)
+++ trunk/data/qcsrc/client/damage.qc	2009-01-19 09:37:16 UTC (rev 5616)
@@ -79,14 +79,26 @@
 		{
 			case WEP_LASER:
 				org2 = org + backoff * 8;
+				sound (self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
 				pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1);
-				sound (self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
 				break;
 			case WEP_SHOTGUN:
 				pointparticles(particleeffectnum("shotgun_impact"), org, backoff * 1000, 1);
+				if(r < 0.05)
+					sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.1)
+					sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.2)
+					sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
 				break;
 			case WEP_UZI:
 				pointparticles(particleeffectnum("machinegun_impact"), org, backoff * 1000, 1);
+				if(r < 0.05)
+					sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.1)
+					sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.2)
+					sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
 				break;
 			case WEP_GRENADE_LAUNCHER:
 				org2 = org + backoff * 12;
@@ -204,6 +216,12 @@
 				break;
 			case WEP_CAMPINGRIFLE:
 				pointparticles(particleeffectnum("machinegun_impact"), org, backoff * 1000, 1);
+				if(r < 0.2)
+					sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.4)
+					sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
+				else if(r < 0.5)
+					sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
 				break;
 			default:
 				dprint("Unhandled damage of weapon ", ftos(hitwep), "\n");
@@ -227,6 +245,9 @@
 	precache_sound("weapons/hookbomb_impact.wav");
 	precache_sound("weapons/laserimpact.wav");
 	precache_sound("weapons/neximpact.wav");
+	precache_sound ("weapons/ric1.wav");
+	precache_sound ("weapons/ric2.wav");
+	precache_sound ("weapons/ric3.wav");
 	precache_sound("weapons/rocket_impact.wav");
 	precache_sound("weapons/seekerexp1.wav");
 	precache_sound("weapons/seekerexp2.wav");
@@ -235,8 +256,4 @@
 	precache_sound("weapons/tagexp2.wav");
 	precache_sound("weapons/tagexp3.wav");
 	precache_sound("weapons/tag_impact.wav");
-
-	// precache_sound ("weapons/ric1.wav"); // not used by anything
-	// precache_sound ("weapons/ric2.wav"); // not used by anything
-	// precache_sound ("weapons/ric3.wav"); // not used by anything
 }

Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-01-19 09:20:54 UTC (rev 5615)
+++ trunk/data/qcsrc/client/projectile.qc	2009-01-19 09:37:16 UTC (rev 5616)
@@ -11,6 +11,7 @@
 .float count; // set if clientside projectile
 .float cnt; // sound index
 .float gravity;
+.float snd_looping;
 
 void Projectile_Draw()
 {
@@ -89,18 +90,21 @@
 void loopsound(entity e, float ch, string samp, float vol, float attn)
 {
 	if(csqc_flags & CSQC_FLAG_COLORCODES)
+	{
 		sound(e, ch, samp, vol, attn);
+		e.snd_looping = 1;
+	}
 }
 
 void Ent_RemoveProjectile()
 {
-	if(self.cnt)
-		loopsound(self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
+	if(self.snd_looping)
+		sound(self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
 }
 
 void Ent_Projectile()
 {
-	float f;
+	float f, r;
 
 	InterpolateOrigin_Undo();