s/(void)/()

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

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 723087a96380634bb539a613145338aa2c96d571..f2e3da898645ddfb755f0bd852e7a077988efa94 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -1,12 +1,12 @@
 #include "g_subs.qh"
-#include "_all.qh"
 
 #include "antilag.qh"
 #include "command/common.qh"
-#include "../warpzonelib/common.qh"
+#include "../lib/warpzone/common.qh"
+#include "../common/triggers/subs.qh"
 
-void spawnfunc_info_null (void)
-{SELFPARAM();
+spawnfunc(info_null)
+{
        remove(self);
        // if anything breaks, tell the mapper to fix his map! info_null is meant to remove itself immediately.
 }
@@ -62,7 +62,7 @@ main
 unused but required by the engine
 ==================
 */
-void main (void)
+void main ()
 {
 
 }
@@ -445,24 +445,24 @@ InitTrigger
 ================
 */
 
-void SetMovedir()
-{SELFPARAM();
-       if (self.movedir != '0 0 0')
-               self.movedir = normalize(self.movedir);
+void SetMovedir(entity this)
+{
+       if(this.movedir != '0 0 0')
+               this.movedir = normalize(this.movedir);
        else
        {
-               makevectors (self.angles);
-               self.movedir = v_forward;
+               makevectors(this.angles);
+               this.movedir = v_forward;
        }
 
-       self.angles = '0 0 0';
+       this.angles = '0 0 0';
 }
 
 void InitTrigger()
 {SELFPARAM();
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-       SetMovedir ();
+       SetMovedir(self);
        self.solid = SOLID_TRIGGER;
        SetBrushEntityModel();
        self.movetype = MOVETYPE_NONE;
@@ -474,7 +474,7 @@ void InitSolidBSPTrigger()
 {SELFPARAM();
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-       SetMovedir ();
+       SetMovedir(self);
        self.solid = SOLID_BSP;
        SetBrushEntityModel();
        self.movetype = MOVETYPE_NONE; // why was this PUSH? -div0