Draw: purge SELFPARAM

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / laser.qc

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 49aa033c17ae3092f4acd65adbe9b151d424c98c..93c4103a9cd993ae2fdc7c45e050bd7e887ce2c3 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,16 +1,27 @@
+#include "laser.qh"
+#include "_all.qh"
+
+#include "hook.qh"
+
+#include "../common/buffs/all.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
+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()
+void Draw_Laser(entity this)
 {
        if(!self.state)
                return;
@@ -19,7 +30,7 @@ void Draw_Laser()
        {
                if(self.count & 0x10)
                {
-                       trace_endpos = self.velocity,
+                       trace_endpos = self.velocity;
                        trace_dphitq3surfaceflags = 0;
                }
                else
@@ -52,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);
@@ -63,11 +74,10 @@ 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)