From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 8 Jul 2011 22:28:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/samual/grenadelauncher_lifetime_bounce'
X-Git-Tag: xonotic-v0.5.0~148^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5a231fcdc55eaf683187a78b0cc5f0142c3c02a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/grenadelauncher_lifetime_bounce'
---

a5a231fcdc55eaf683187a78b0cc5f0142c3c02a
diff --cc qcsrc/server/w_grenadelauncher.qc
index 15452ed78,f7e789228..1d2ee93b9
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@@ -126,19 -126,23 +126,23 @@@ void W_Grenade_Touch2 (void
  		float r;
  		r = random() * 6;
  		if(r < 1)
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
  		else if(r < 2)
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
  		else if(r < 3)
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
  		else if(r < 4)
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
  		else if(r < 5)
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
  		else
 -			spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
 +			spamsound (self, CH_SHOTS, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
  		self.projectiledeathtype |= HITTYPE_BOUNCE;
  		self.gl_bouncecnt += 1;
+ 		
+ 		if (autocvar_g_balance_grenadelauncher_secondary_lifetime_bounce && self.gl_bouncecnt == 1)
+ 			self.nextthink = time + autocvar_g_balance_grenadelauncher_secondary_lifetime_bounce;
+ 			
  	}
  	else if(autocvar_g_balance_grenadelauncher_secondary_type == 2 && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) // stick
  	{