Merge branch 'terencehill/announcer_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / misc / laser.qc

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index 29a18562688a9d4e44a154436abcb6277828e952..8bfa35f40da77688d516a8e36688628e766781c6 100644 (file)
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,5 +1,4 @@
 #if defined(CSQC)
-       #include "../../buffs/all.qh"
        #include "../../../lib/csqcmodel/interpolate.qh"
        #include "../../../client/main.qh"
        #include "../../../lib/csqcmodel/cl_model.qh"
@@ -7,6 +6,8 @@
 #elif defined(SVQC)
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_LASER)
+
 #ifdef SVQC
 .float modelscale;
 void misc_laser_aim()
@@ -322,8 +323,8 @@ void Draw_Laser(entity this)
        }
 }
 
-void Ent_Laser()
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_LASER, bool isnew)
+{
        InterpolateOrigin_Undo();
 
        // 30 bytes, or 13 bytes for just moving
@@ -379,6 +380,9 @@ void Ent_Laser()
        }
        if(f & 4)
                self.state = ReadByte();
+
+       return = true;
+
        InterpolateOrigin_Note();
        self.draw = Draw_Laser;
 }