Merge branch 'master' into terencehill/menu_gametype_tooltips_2

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

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index f0a9a459468c69fb07012b8e9d18d21484dd5a73..93c4103a9cd993ae2fdc7c45e050bd7e887ce2c3 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,20 +1,17 @@
 #include "laser.qh"
+#include "_all.qh"
 
 #include "hook.qh"
-#include "main.qh"
 
-#include "../common/buffs.qh"
+#include "../common/buffs/all.qh"
 
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
-
 // a laser goes from origin in direction angles
 // it has color 'colormod'
 // and stops when something is in the way
-entityclass(Laser)
+entityclass(Laser);
 class(Laser) .int cnt; // end effect
 class(Laser) .vector colormod;
 class(Laser) .int state; // on-off
@@ -24,7 +21,7 @@ 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;