Merge branch 'terencehill/v_deathtilt_fix' into 'master'

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

diff --git a/qcsrc/server/g_subs.qh b/qcsrc/server/g_subs.qh
index d62bbb6124e57bd014b2976bde0d5532990b5f98..1b785c2f284b6f59232519cbc2c0d87301a52447 100644 (file)
--- a/qcsrc/server/g_subs.qh
+++ b/qcsrc/server/g_subs.qh
@@ -1,27 +1,11 @@
-#ifndef G_SUBS_H
-#define G_SUBS_H
+#pragma once
 
-void SUB_NullThink(void);
+void SUB_NullThink(entity this);
 
-void()  SUB_CalcMoveDone;
-void() SUB_CalcAngleMoveDone;
-//void() SUB_UseTargets;
-void() SUB_Remove;
+void SUB_CalcMoveDone(entity this);
+void SUB_CalcAngleMoveDone(entity this);
 
-void spawnfunc_info_null (void);
-
-void setanim(entity e, vector anim, float looping, float override, float restart);
-
-void updateanim(entity e);
-
-/*
-==================
-SUB_Remove
-
-Remove self
-==================
-*/
-void SUB_Remove (void);
+spawnfunc(info_null);
 
 /*
 ==================
@@ -31,7 +15,7 @@ Applies some friction to self
 ==================
 */
 .float friction;
-void SUB_Friction (void);
+void SUB_Friction ();
 
 /*
 ==================
@@ -42,7 +26,7 @@ Makes client invisible or removes non-client
 */
 void SUB_VanishOrRemove (entity ent);
 
-void SUB_SetFade_Think (void);
+void SUB_SetFade_Think (entity this);
 
 /*
 ==================
@@ -61,20 +45,20 @@ calculate self.velocity and self.nextthink to reach dest from
 self.origin traveling at speed
 ===============
 */
-void SUB_CalcMoveDone (void);
+void SUB_CalcMoveDone(entity this);
 
 .float platmovetype_turn;
-void SUB_CalcMove_controller_think (void);
+void SUB_CalcMove_controller_think (entity this);
 
 void SUB_CalcMove_controller_setbezier (entity controller, vector org, vector control, vector dest);
 
 void SUB_CalcMove_controller_setlinear (entity controller, vector org, vector dest);
 
-void SUB_CalcMove_Bezier (vector tcontrol, vector tdest, float tspeedtype, float tspeed, void() func);
+void SUB_CalcMove_Bezier (vector tcontrol, vector tdest, float tspeedtype, float tspeed, void(entity this) func);
 
-void SUB_CalcMove (vector tdest, float tspeedtype, float tspeed, void() func);
+void SUB_CalcMove (vector tdest, float tspeedtype, float tspeed, void(entity this) func);
 
-void SUB_CalcMoveEnt (entity ent, vector tdest, float tspeedtype, float tspeed, void() func);
+void SUB_CalcMoveEnt (entity ent, vector tdest, float tspeedtype, float tspeed, void(entity this) func);
 
 /*
 =============
@@ -86,12 +70,12 @@ self.angles rotating
 The calling function should make sure self.think is valid
 ===============
 */
-void SUB_CalcAngleMoveDone (void);
+void SUB_CalcAngleMoveDone (entity this);
 
 // FIXME: I fixed this function only for rotation around the main axes
-void SUB_CalcAngleMove (vector destangle, float tspeedtype, float tspeed, void() func);
+void SUB_CalcAngleMove (vector destangle, float tspeedtype, float tspeed, void(entity this) func);
 
-void SUB_CalcAngleMoveEnt (entity ent, vector destangle, float tspeedtype, float tspeed, void() func);
+void SUB_CalcAngleMoveEnt (entity ent, vector destangle, float tspeedtype, float tspeed, void(entity this) func);
 
 /*
 ==================
@@ -100,7 +84,7 @@ main
 unused but required by the engine
 ==================
 */
-void main (void);
+void main ();
 
 // Misc
 
@@ -135,15 +119,6 @@ Ripped from DPMod
 */
 vector findbetterlocation (vector org, float mindist);
 
-/*
-==================
-crandom
-
-Returns a random number between -1.0 and 1.0
-==================
-*/
-float crandom (void);
-
 /*
 ==================
 Angc used for animations
@@ -167,7 +142,7 @@ float LOD_customize();
 
 void LOD_uncustomize();
 
-void LODmodel_attach();
+void LODmodel_attach(entity this);
 
 void ApplyMinMaxScaleAngles(entity e);
 
@@ -181,11 +156,10 @@ InitTrigger
 ================
 */
 
-void SetMovedir();
+void SetMovedir(entity this);
 
 void InitTrigger();
 
 void InitSolidBSPTrigger();
 
-float InitMovingBrushTrigger();
-#endif
+bool InitMovingBrushTrigger(entity this);