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

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index a91e13b01..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()
 {
@@ -24,7 +30,7 @@ void Draw_Laser()
 	{
 		if(self.count & 0x10)
 		{
-			trace_endpos = self.velocity,
+			trace_endpos = self.velocity;
 			trace_dphitq3surfaceflags = 0;
 		}
 		else
@@ -57,7 +63,7 @@ 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);
@@ -68,23 +74,23 @@ void Draw_Laser()
 
 void Ent_Laser()
 {
-	float f;
 	InterpolateOrigin_Undo();
 
 	// 30 bytes, or 13 bytes for just moving
-	f = ReadByte();
+	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)
 	{