X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Flaser.qc;h=f5b6d54a9b32bd8df2fe39d95591981d124a28c7;hb=91b5b85f82da949105551eb0ec01888ec52e8a99;hp=6703b1b11f82ad1b96d7e387d33b36d2b44b7996;hpb=cc7d9b829f2b8e1eb1bb04ef30541fbc7b688e2d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 6703b1b11..f5b6d54a9 100644
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,19 +1,25 @@
+#include "laser.qh"
+#include "_all.qh"
+
+#include "hook.qh"
+
+#include "../common/buffs.qh"
+
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/interpolate.qh"
+
 // a laser goes from origin in direction angles
 // it has color 'colormod'
 // and stops when something is in the way
-.float cnt; // end effect
-.vector colormod;
-.float state; // on-off
-.float count; // flags for the laser
-.vector velocity;
-.float alpha;
-.float scale; // scaling factor of the thickness
-.float modelscale; // scaling factor of the dlight
-
-// TODO move these into a heade file
-float trace_dphitq3surfaceflags;
-float Q3SURFACEFLAG_SKY = 4; // sky surface (also has NOIMPACT and NOMARKS set)
-float Q3SURFACEFLAG_NOIMPACT = 16; // projectiles should remove themselves on impact (this is set on sky)
+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
 
 void Draw_Laser()
 {
@@ -22,14 +28,29 @@ void Draw_Laser()
 	InterpolateOrigin_Do();
 	if(self.count & 0x80)
 	{
-		traceline(self.origin, self.velocity, 0, self);
+		if(self.count & 0x10)
+		{
+			trace_endpos = self.velocity;
+			trace_dphitq3surfaceflags = 0;
+		}
+		else
+			traceline(self.origin, self.velocity, 0, self);
 	}
 	else
 	{
-		makevectors(self.angles);
-		traceline(self.origin, self.origin + v_forward * 32768, 0, self);
-		if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
+		if(self.count & 0x10)
+		{
+			makevectors(self.angles);
 			trace_endpos = self.origin + v_forward * 1048576;
+			trace_dphitq3surfaceflags = Q3SURFACEFLAG_SKY;
+		}
+		else
+		{
+			makevectors(self.angles);
+			traceline(self.origin, self.origin + v_forward * 32768, 0, self);
+			if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
+				trace_endpos = self.origin + v_forward * 1048576;
+		}
 	}
 	if(self.scale != 0)
 	{
@@ -42,34 +63,34 @@ void Draw_Laser()
 			Draw_CylindricLine(self.origin, trace_endpos, self.scale, "particles/laserbeam", 0, time * 3, self.colormod, 0.5, DRAWFLAG_ADDITIVE, view_origin);
 		}
 	}
-	if not(trace_dphitq3surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT))
+	if (!(trace_dphitq3surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT)))
 	{
 		if(self.cnt >= 0)
 			pointparticles(self.cnt, trace_endpos, trace_plane_normal, drawframetime * 1000);
 		if(self.colormod != '0 0 0' && self.modelscale != 0)
-			R_AddDynamicLight(trace_endpos + trace_plane_normal * 1, self.modelscale, self.colormod * 5);
+			adddynamiclight(trace_endpos + trace_plane_normal * 1, self.modelscale, self.colormod * 5);
 	}
 }
 
 void Ent_Laser()
 {
-	float f;
 	InterpolateOrigin_Undo();
 
 	// 30 bytes, or 13 bytes for just moving
-	f = ReadByte();
-	self.count = (f & 0xE0);
+	int f = ReadByte();
+	self.count = (f & 0xF0);
 
 	if(self.count & 0x80)
-		self.iflags = IFLAG_VELOCITY;
+		self.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN;
 	else
-		self.iflags = IFLAG_ANGLES;
+		self.iflags = IFLAG_ANGLES | IFLAG_ORIGIN;
 
 	if(f & 1)
 	{
 		self.origin_x = ReadCoord();
 		self.origin_y = ReadCoord();
 		self.origin_z = ReadCoord();
+		setorigin(self, self.origin);
 	}
 	if(f & 8)
 	{
@@ -87,7 +108,10 @@ void Ent_Laser()
 			self.scale *= ReadByte() / 16.0; // beam radius
 			self.modelscale *= ReadByte() / 16.0; // dlight radius
 		}
-		self.cnt = ReadShort() - 1; // effect number
+		if((f & 0x80) || !(f & 0x10))
+			self.cnt = ReadShort() - 1; // effect number
+		else
+			self.cnt = 0;
 	}
 	if(f & 2)
 	{