X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fmisc%2Flaser.qc;h=ed15a2ab382e7dccd57646a4b914d5155288dcef;hb=cf41044c9d897080866da6e0ca39d807e094e23e;hp=f0aafc7c40e5d06238324f87b0eb6d14dec518bb;hpb=aa14e2a0c66030cfde1c5d9d2c0882b5aa4816c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index f0aafc7c4..ed15a2ab3 100644
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,7 +1,8 @@
+#include "laser.qh"
 #if defined(CSQC)
-	#include <lib/csqcmodel/interpolate.qh>
-	#include <client/main.qh>
-	#include <lib/csqcmodel/cl_model.qh>
+#include <lib/csqcmodel/interpolate.qh>
+#include <client/main.qh>
+#include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif
@@ -13,37 +14,27 @@ REGISTER_NET_LINKED(ENT_CLIENT_LASER)
 void misc_laser_aim(entity this)
 {
 	vector a;
-	if(this.enemy)
-	{
-		if(this.spawnflags & 2)
-		{
-			if(this.enemy.origin != this.mangle)
-			{
+	if (this.enemy) {
+		if (this.spawnflags & 2) {
+			if (this.enemy.origin != this.mangle) {
 				this.mangle = this.enemy.origin;
 				this.SendFlags |= 2;
 			}
-		}
-		else
-		{
+		} else {
 			a = vectoangles(this.enemy.origin - this.origin);
 			a_x = -a_x;
-			if(a != this.mangle)
-			{
+			if (a != this.mangle) {
 				this.mangle = a;
 				this.SendFlags |= 2;
 			}
 		}
-	}
-	else
-	{
-		if(this.angles != this.mangle)
-		{
+	} else {
+		if (this.angles != this.mangle) {
 			this.mangle = this.angles;
 			this.SendFlags |= 2;
 		}
 	}
-	if(this.origin != this.oldorigin)
-	{
+	if (this.origin != this.oldorigin) {
 		this.SendFlags |= 1;
 		this.oldorigin = this.origin;
 	}
@@ -51,8 +42,9 @@ void misc_laser_aim(entity this)
 
 void misc_laser_init(entity this)
 {
-	if(self.target != "")
-		self.enemy = find(world, targetname, self.target);
+	if (this.target != "") {
+		this.enemy = find(NULL, targetname, this.target);
+	}
 }
 
 .entity pusher;
@@ -62,62 +54,56 @@ void misc_laser_think(entity this)
 	entity hitent;
 	vector hitloc;
 
-	self.nextthink = time;
+	this.nextthink = time;
 
-	if(!self.state)
+	if (!this.state) {
 		return;
+	}
 
 	misc_laser_aim(this);
 
-	if(self.enemy)
-	{
-		o = self.enemy.origin;
-		if (!(self.spawnflags & 2))
-			o = self.origin + normalize(o - self.origin) * 32768;
-	}
-	else
-	{
-		makevectors(self.mangle);
-		o = self.origin + v_forward * 32768;
+	if (this.enemy) {
+		o = this.enemy.origin;
+		if (!(this.spawnflags & 2)) {
+			o = this.origin + normalize(o - this.origin) * 32768;
+		}
+	} else {
+		makevectors(this.mangle);
+		o = this.origin + v_forward * 32768;
 	}
 
-	if(self.dmg || self.enemy.target != "")
-	{
-		traceline(self.origin, o, MOVE_NORMAL, self);
+	if (this.dmg || this.enemy.target != "") {
+		traceline(this.origin, o, MOVE_NORMAL, this);
 	}
 	hitent = trace_ent;
 	hitloc = trace_endpos;
 
-	if(self.enemy.target != "") // DETECTOR laser
-	{
-		if(trace_ent.iscreature)
-		{
-			self.pusher = hitent;
-			if(!self.count)
-			{
-				self.count = 1;
+	if (this.enemy.target != "") { // DETECTOR laser
+		if (trace_ent.iscreature) {
+			this.pusher = hitent;
+			if (!this.count) {
+				this.count = 1;
 
-				SUB_UseTargets(self.enemy, self.enemy.pusher, NULL);
+				SUB_UseTargets(this.enemy, this.enemy.pusher, NULL);
 			}
-		}
-		else
-		{
-			if(self.count)
-			{
-				self.count = 0;
+		} else {
+			if (this.count) {
+				this.count = 0;
 
-				SUB_UseTargets(self.enemy, self.enemy.pusher, NULL);
+				SUB_UseTargets(this.enemy, this.enemy.pusher, NULL);
 			}
 		}
 	}
 
-	if(self.dmg)
-	{
-		if(self.team)
-			if(((self.spawnflags & 8) == 0) == (self.team != hitent.team))
+	if (this.dmg) {
+		if (this.team) {
+			if (((this.spawnflags & 8) == 0) == (this.team != hitent.team)) {
 				return;
-		if(hitent.takedamage)
-			Damage(hitent, self, self, ((self.dmg < 0) ? 100000 : (self.dmg * frametime)), DEATH_HURTTRIGGER.m_id, hitloc, '0 0 0');
+			}
+		}
+		if (hitent.takedamage) {
+			Damage(hitent, this, this, ((this.dmg < 0) ? 100000 : (this.dmg * frametime)), DEATH_HURTTRIGGER.m_id, hitloc, '0 0 0');
+		}
 	}
 }
 
@@ -125,52 +111,52 @@ bool laser_SendEntity(entity this, entity to, float fl)
 {
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_LASER);
 	fl = fl - (fl & 0xF0); // use that bit to indicate finite length laser
-	if(self.spawnflags & 2)
+	if (this.spawnflags & 2) {
 		fl |= 0x80;
-	if(self.alpha)
+	}
+	if (this.alpha) {
 		fl |= 0x40;
-	if(self.scale != 1 || self.modelscale != 1)
+	}
+	if (this.scale != 1 || this.modelscale != 1) {
 		fl |= 0x20;
-	if(self.spawnflags & 4)
+	}
+	if (this.spawnflags & 4) {
 		fl |= 0x10;
+	}
 	WriteByte(MSG_ENTITY, fl);
-	if(fl & 1)
-	{
-		WriteCoord(MSG_ENTITY, self.origin_x);
-		WriteCoord(MSG_ENTITY, self.origin_y);
-		WriteCoord(MSG_ENTITY, self.origin_z);
+	if (fl & 1) {
+		WriteCoord(MSG_ENTITY, this.origin_x);
+		WriteCoord(MSG_ENTITY, this.origin_y);
+		WriteCoord(MSG_ENTITY, this.origin_z);
 	}
-	if(fl & 8)
-	{
-		WriteByte(MSG_ENTITY, self.colormod_x * 255.0);
-		WriteByte(MSG_ENTITY, self.colormod_y * 255.0);
-		WriteByte(MSG_ENTITY, self.colormod_z * 255.0);
-		if(fl & 0x40)
-			WriteByte(MSG_ENTITY, self.alpha * 255.0);
-		if(fl & 0x20)
-		{
-			WriteByte(MSG_ENTITY, bound(0, self.scale * 16.0, 255));
-			WriteByte(MSG_ENTITY, bound(0, self.modelscale * 16.0, 255));
+	if (fl & 8) {
+		WriteByte(MSG_ENTITY, this.colormod_x * 255.0);
+		WriteByte(MSG_ENTITY, this.colormod_y * 255.0);
+		WriteByte(MSG_ENTITY, this.colormod_z * 255.0);
+		if (fl & 0x40) {
+			WriteByte(MSG_ENTITY, this.alpha * 255.0);
 		}
-		if((fl & 0x80) || !(fl & 0x10)) // effect doesn't need sending if the laser is infinite and has collision testing turned off
-			WriteShort(MSG_ENTITY, self.cnt + 1);
-	}
-	if(fl & 2)
-	{
-		if(fl & 0x80)
-		{
-			WriteCoord(MSG_ENTITY, self.enemy.origin_x);
-			WriteCoord(MSG_ENTITY, self.enemy.origin_y);
-			WriteCoord(MSG_ENTITY, self.enemy.origin_z);
+		if (fl & 0x20) {
+			WriteByte(MSG_ENTITY, bound(0, this.scale * 16.0, 255));
+			WriteByte(MSG_ENTITY, bound(0, this.modelscale * 16.0, 255));
 		}
-		else
-		{
-			WriteAngle(MSG_ENTITY, self.mangle_x);
-			WriteAngle(MSG_ENTITY, self.mangle_y);
+		if ((fl & 0x80) || !(fl & 0x10)) { // effect doesn't need sending if the laser is infinite and has collision testing turned off
+			WriteShort(MSG_ENTITY, this.cnt + 1);
 		}
 	}
-	if(fl & 4)
-		WriteByte(MSG_ENTITY, self.state);
+	if (fl & 2) {
+		if (fl & 0x80) {
+			WriteCoord(MSG_ENTITY, this.enemy.origin_x);
+			WriteCoord(MSG_ENTITY, this.enemy.origin_y);
+			WriteCoord(MSG_ENTITY, this.enemy.origin_z);
+		} else {
+			WriteAngle(MSG_ENTITY, this.mangle_x);
+			WriteAngle(MSG_ENTITY, this.mangle_y);
+		}
+	}
+	if (fl & 4) {
+		WriteByte(MSG_ENTITY, this.state);
+	}
 	return 1;
 }
 
@@ -195,43 +181,46 @@ void laser_use(entity this, entity actor, entity trigger)
 
 void laser_reset(entity this)
 {
-	if(this.spawnflags & 1)
+	if (this.spawnflags & 1) {
 		this.state = 1;
-	else
+	} else {
 		this.state = 0;
+	}
 }
 
 spawnfunc(misc_laser)
 {
-	if(this.mdl)
-	{
-		if(this.mdl == "none")
+	if (this.mdl) {
+		if (this.mdl == "none") {
 			this.cnt = -1;
-		else
-		{
+		} else {
 			this.cnt = _particleeffectnum(this.mdl);
-			if(this.cnt < 0 && this.dmg)
-                this.cnt = particleeffectnum(EFFECT_LASER_DEADLY);
+			if (this.cnt < 0 && this.dmg) {
+				this.cnt = particleeffectnum(EFFECT_LASER_DEADLY);
+			}
 		}
-	}
-	else if(!this.cnt)
-	{
-		if(this.dmg)
+	} else if (!this.cnt) {
+		if (this.dmg) {
 			this.cnt = particleeffectnum(EFFECT_LASER_DEADLY);
-		else
+		} else {
 			this.cnt = -1;
+		}
 	}
-	if(this.cnt < 0)
+	if (this.cnt < 0) {
 		this.cnt = -1;
+	}
 
-	if(this.colormod == '0 0 0')
-		if(!this.alpha)
+	if (this.colormod == '0 0 0') {
+		if (!this.alpha) {
 			this.colormod = '1 0 0';
-	if(this.message == "") this.message = "saw the light";
-	if (this.message2 == "") this.message2 = "was pushed into a laser by";
-	if(!this.scale) this.scale = 1;
-	if(!this.modelscale) this.modelscale = 1;
-	else if(this.modelscale < 0) this.modelscale = 0;
+		}
+	}
+	if (this.message == "") { this.message = "saw the light"; }
+	if (this.message2 == "") { this.message2 = "was pushed into a laser by"; }
+	if (!this.scale) { this.scale = 1; }
+	if (!this.modelscale) { this.modelscale = 1; } else if (this.modelscale < 0) {
+		this.modelscale = 0;
+	}
 	setthink(this, misc_laser_think);
 	this.nextthink = time;
 	InitializeEntity(this, misc_laser_init, INITPRIO_FINDTARGET);
@@ -240,14 +229,13 @@ spawnfunc(misc_laser)
 
 	Net_LinkEntity(this, false, 0, laser_SendEntity);
 
-	IFTARGETED
-	{
+	if (THIS_TARGETED) {
 		this.reset = laser_reset;
 		this.reset(this);
 		this.use = laser_use;
-	}
-	else
+	} else {
 		this.state = 1;
+	}
 }
 #elif defined(CSQC)
 
@@ -255,63 +243,55 @@ spawnfunc(misc_laser)
 // it has color 'colormod'
 // and stops when something is in the way
 entityclass(Laser);
-class(Laser) .int cnt; // end effect
-class(Laser) .vector colormod;
-class(Laser) .int state; // on-off
-class(Laser) .int count; // flags for the laser
-class(Laser) .vector velocity;
-class(Laser) .float alpha;
-class(Laser) .float scale; // scaling factor of the thickness
-class(Laser) .float modelscale; // scaling factor of the dlight
+class(Laser).int cnt;          // end effect
+class(Laser).vector colormod;
+class(Laser).int state;        // on-off
+class(Laser).int count;        // flags for the laser
+class(Laser).vector velocity;
+class(Laser).float alpha;
+class(Laser).float scale;      // scaling factor of the thickness
+class(Laser).float modelscale; // scaling factor of the dlight
 
 void Draw_Laser(entity this)
 {
-	if(!this.state)
+	if (!this.state) {
 		return;
+	}
 	InterpolateOrigin_Do(this);
-	if(this.count & 0x80)
-	{
-		if(this.count & 0x10)
-		{
+	if (this.count & 0x80) {
+		if (this.count & 0x10) {
 			trace_endpos = this.velocity;
 			trace_dphitq3surfaceflags = 0;
-		}
-		else
+		} else {
 			traceline(this.origin, this.velocity, 0, this);
-	}
-	else
-	{
-		if(this.count & 0x10)
-		{
+		}
+	} else {
+		if (this.count & 0x10) {
 			makevectors(this.angles);
 			trace_endpos = this.origin + v_forward * 1048576;
 			trace_dphitq3surfaceflags = Q3SURFACEFLAG_SKY;
-		}
-		else
-		{
+		} else {
 			makevectors(this.angles);
 			traceline(this.origin, this.origin + v_forward * 32768, 0, this);
-			if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
+			if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY) {
 				trace_endpos = this.origin + v_forward * 1048576;
+			}
 		}
 	}
-	if(this.scale != 0)
-	{
-		if(this.alpha)
-		{
+	if (this.scale != 0) {
+		if (this.alpha) {
 			Draw_CylindricLine(this.origin, trace_endpos, this.scale, "particles/laserbeam", 0, time * 3, this.colormod, this.alpha, DRAWFLAG_NORMAL, view_origin);
-		}
-		else
-		{
+		} else {
 			Draw_CylindricLine(this.origin, trace_endpos, this.scale, "particles/laserbeam", 0, time * 3, this.colormod, 0.5, DRAWFLAG_ADDITIVE, view_origin);
 		}
 	}
-	if (!(trace_dphitq3surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT)))
-	{
-		if(this.cnt >= 0)
+	if (!(trace_dphitq3surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT))) {
+		if (this.cnt >= 0) {
 			__pointparticles(this.cnt, trace_endpos, trace_plane_normal, drawframetime * 1000);
-		if(this.colormod != '0 0 0' && this.modelscale != 0)
+		}
+		if (this.colormod != '0 0 0' && this.modelscale != 0) {
 			adddynamiclight(trace_endpos + trace_plane_normal * 1, this.modelscale, this.colormod * 5);
+		}
 	}
 }
 
@@ -323,59 +303,57 @@ NET_HANDLE(ENT_CLIENT_LASER, bool isnew)
 	int f = ReadByte();
 	this.count = (f & 0xF0);
 
-	if(this.count & 0x80)
+	if (this.count & 0x80) {
 		this.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN;
-	else
+	} else {
 		this.iflags = IFLAG_ANGLES | IFLAG_ORIGIN;
+	}
 
-	if(f & 1)
-	{
+	if (f & 1) {
 		this.origin_x = ReadCoord();
 		this.origin_y = ReadCoord();
 		this.origin_z = ReadCoord();
 		setorigin(this, this.origin);
 	}
-	if(f & 8)
-	{
+	if (f & 8) {
 		this.colormod_x = ReadByte() / 255.0;
 		this.colormod_y = ReadByte() / 255.0;
 		this.colormod_z = ReadByte() / 255.0;
-		if(f & 0x40)
+		if (f & 0x40) {
 			this.alpha = ReadByte() / 255.0;
-		else
+		} else {
 			this.alpha = 0;
+		}
 		this.scale = 2;
 		this.modelscale = 50;
-		if(f & 0x20)
-		{
-			this.scale *= ReadByte() / 16.0; // beam radius
+		if (f & 0x20) {
+			this.scale *= ReadByte() / 16.0;      // beam radius
 			this.modelscale *= ReadByte() / 16.0; // dlight radius
 		}
-		if((f & 0x80) || !(f & 0x10))
-			this.cnt = ReadShort() - 1; // effect number
-		else
+		if ((f & 0x80) || !(f & 0x10)) {
+			this.cnt = ReadShort() - 1;           // effect number
+		} else {
 			this.cnt = 0;
+		}
 	}
-	if(f & 2)
-	{
-		if(f & 0x80)
-		{
+	if (f & 2) {
+		if (f & 0x80) {
 			this.velocity_x = ReadCoord();
 			this.velocity_y = ReadCoord();
 			this.velocity_z = ReadCoord();
-		}
-		else
-		{
+		} else {
 			this.angles_x = ReadAngle();
 			this.angles_y = ReadAngle();
 		}
 	}
-	if(f & 4)
+	if (f & 4) {
 		this.state = ReadByte();
+	}
 
 	return = true;
 
 	InterpolateOrigin_Note(this);
 	this.draw = Draw_Laser;
+	if (isnew) { IL_PUSH(g_drawables, this); }
 }
 #endif