Merge branch 'master' into Mario/vaporizer_damage

[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 d5cc657bffc7f50bf860182748ccd1e608326ed3..f7382d1666b15b6c295903b3fa90260be3c720a2 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;
@@ -34,10 +38,10 @@ void dynlight_think()
                remove(self);
 
        self.nextthink = time + 0.1;
-};
+}
 void dynlight_find_aiment()
 {
-       local entity targ;
+       entity targ;
        if (!self.target)
                objerror ("dynlight: no target to follow");
 
@@ -50,10 +54,10 @@ void dynlight_find_aiment()
        self.v_angle = self.angles - targ.angles;
        self.think = dynlight_think;
        self.nextthink = time + 0.1;
-};
+}
 void dynlight_find_path()
 {
-       local entity targ;
+       entity targ;
        if (!self.target)
                objerror ("dynlight: no target to follow");
 
@@ -62,10 +66,10 @@ void dynlight_find_path()
        setorigin (self, targ.origin);
        self.think = train_next;
        self.nextthink = time + 0.1;
-};
+}
 void dynlight_find_target()
 {
-       local entity targ;
+       entity targ;
        if (!self.target)
                objerror ("dynlight: no target to follow");
 
@@ -81,11 +85,9 @@ void dynlight_use()
                self.light_lev = self.lefty;
        else
                self.light_lev = 0;
-};
+}
 void 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)
@@ -125,4 +127,4 @@ void spawnfunc_dynlight()
                InitializeEntity(self, dynlight_find_path, INITPRIO_FINDTARGET);
                return;
        }
-};
+}