From: Mario <mario@smbclan.net>
Date: Thu, 12 Nov 2015 10:17:35 +0000 (+1000)
Subject: Add an extra option to change how long beams last
X-Git-Tag: xonotic-v0.8.2~1674^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4cd929016b17e11f9a5b10f407a162814a5a15ed;p=xonotic%2Fxonotic-data.pk3dir.git

Add an extra option to change how long beams last
---

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index ef9af14d5..34c2ccd2b 100644
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -75,7 +75,8 @@ void SendCSQCVaporizerBeamParticle(entity player, int hit) {
 	WriteByte(MSG_BROADCAST, player.team);
 }
 #elif defined(CSQC)
-bool autocvar_cl_particles_vaporizerbeam = true;
+bool autocvar_cl_vaporizerbeam_particle = true;
+float autocvar_cl_vaporizerbeam_lifetime = 0.8;
 
 string Draw_VaporizerBeam_trace_callback_tex;
 float Draw_VaporizerBeam_trace_callback_rnd;
@@ -124,7 +125,7 @@ NET_HANDLE(TE_CSQC_VAPORBEAMPARTICLE, bool isNew)
 {
 	Net_Accept(vortex_beam);
 	this.think = SUB_Remove;
-	this.nextthink = time + 0.8;
+	this.nextthink = time + bound(0, autocvar_cl_vaporizerbeam_lifetime, 10);
 	this.draw = VaporizerBeam_Draw;
 	this.drawmask = MASK_NORMAL;
 
@@ -134,12 +135,12 @@ NET_HANDLE(TE_CSQC_VAPORBEAMPARTICLE, bool isNew)
 	this.sv_entnum = ReadShort();
 	this.team = ReadByte() - 1;
 
-	if(autocvar_cl_particles_vaporizerbeam)
+	if(autocvar_cl_vaporizerbeam_particle)
 	{
 		WarpZone_TrailParticles(world, particleeffectnum(((this.cnt) ? EFFECT_VAPORIZER_HIT(this.team) : EFFECT_VAPORIZER(this.team))), this.vorg1, this.vorg2);
 		this.draw = func_null;
 		this.drawmask = MASK_NORMAL;
-		this.nextthink = time + 0.1;
+		remove(this);
 	}
 
 	pointparticles(EFFECT_VORTEX_MUZZLEFLASH, this.vorg1, normalize(this.vorg2 - this.vorg1) * 1000, 1);