Merge branch 'master' into terencehill/tooltips_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_lights.qc

diff --git a/qcsrc/server/g_lights.qc b/qcsrc/server/g_lights.qc
index b5f4bcf8441b0f382dd10813e60c1517c80107be..bd5232a1c93338c5de9e164531cd5296798b0730 100644 (file)
--- a/qcsrc/server/g_lights.qc
+++ b/qcsrc/server/g_lights.qc
@@ -1,7 +1,11 @@
-float LOOP = 1;
+#include "_all.qh"
 
-float DNOSHADOW = 2;
-float DFOLLOW = 4;
+void train_next();
+
+const float LOOP = 1;
+
+const float DNOSHADOW = 2;
+const float DFOLLOW = 4;
 .float light_lev;
 .float lefty;
 .vector color;
@@ -82,10 +86,8 @@ void dynlight_use()
        else
                self.light_lev = 0;
 }
-void spawnfunc_dynlight()
+spawnfunc(dynlight)
 {
-       local   entity  targ;
-
        if (!self.light_lev)
                self.light_lev = 200;
        if (!self.color)
@@ -96,7 +98,7 @@ void spawnfunc_dynlight()
        setorigin (self, self.origin);
        //self.pflags = PFLAGS_FULLDYNAMIC;
        self.solid = SOLID_NOT;
-       //self.blocked = SUB_Null;
+       //self.blocked = func_null;
        //if (self.spawnflags & DNOSHADOW)
        //      self.pflags = self.pflags + PFLAGS_NOSHADOW;
        //if (self.spawnflags & START_OFF)