X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_subs.qc;h=6444ffdb3cec98fcf7f97114736f340c493964ef;hb=dd70edcca2f19a7b95b1f0441db75c154bf10606;hp=9f4c22a02697d9e72213b4fa0350a8c4b021bf91;hpb=55a4c54757ace30c9d82a63b73e8b6bce32b4643;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 9f4c22a026..6444ffdb3c 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -1,6 +1,4 @@
-void SUB_Null() {}
-float SUB_True() { return 1; }
-float SUB_False() { return 0; }
+void SUB_NullThink(void) { }
 
 void(vector destangle, float tspeed, void() func) SUB_CalcAngleMove;
 void()  SUB_CalcMoveDone;
@@ -94,7 +92,7 @@ Makes client invisible or removes non-client
 */
 void SUB_VanishOrRemove (entity ent)
 {
-	if (ent.flags & FL_CLIENT)
+	if (IS_CLIENT(ent))
 	{
 		// vanish
 		ent.alpha = -1;
@@ -131,9 +129,6 @@ Fade 'ent' out when time >= 'when'
 */
 void SUB_SetFade (entity ent, float when, float fadetime)
 {
-	//if (ent.flags & FL_CLIENT) // && ent.deadflag != DEAD_NO)
-	//	return;
-	//ent.alpha = 1;
 	ent.fade_rate = 1/fadetime;
 	ent.think = SUB_SetFade_Think;
 	ent.nextthink = when;
@@ -267,7 +262,7 @@ void SUB_CalcMove_Bezier (vector tcontrol, vector tdest, float tspeed, void() fu
 	controller.think1 = self.think;
 
 	// the thinking is now done by the controller
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 	self.nextthink = self.ltime + traveltime;
 	
 	// invoke controller
@@ -418,7 +413,7 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
 	// check whether antilagged traces are enabled
 	if (lag < 0.001)
 		lag = 0;
-	if (clienttype(forent) != CLIENTTYPE_REAL)
+	if not(IS_REAL_CLIENT(forent))
 		lag = 0; // only antilag for clients
 
 	// change shooter to SOLID_BBOX so the shot can hit corpses