Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

diff --git a/qcsrc/server/attic/nexball.qc b/qcsrc/server/attic/nexball.qc
index ee0c13b87d20cd3f5740505057572be23bb4cc50..6f267426146f61a0e46426e4986c82fe66bc3c06 100644 (file)
--- a/qcsrc/server/attic/nexball.qc
+++ b/qcsrc/server/attic/nexball.qc
@@ -165,7 +165,7 @@ void GiveBall (entity plyr, entity ball)
 
        ball.velocity = '0 0 0';
        ball.movetype = MOVETYPE_NONE;
-       ball.touch = SUB_Null;
+       ball.touch = func_null;
        ball.effects |= EF_NOSHADOW;
        ball.scale = 1; // scale down.
 
@@ -235,7 +235,7 @@ void ResetBall (void)
        if (self.cnt < 2) { // step 1
                if (time == self.teamtime)
                        bprint("The ", ColoredTeamName(self.team), " held the ball for too long.\n");
-               self.touch = SUB_Null;
+               self.touch = func_null;
                self.movetype = MOVETYPE_NOCLIP;
                self.velocity = '0 0 0'; // just in case?
                if(!self.cnt)
@@ -394,7 +394,7 @@ void GoalTouch (void)
        ball.cnt = 1;
        ball.think = ResetBall;
        if (ball.classname == "nexball_basketball")
-               ball.touch = football_touch; // better than SUB_Null: football control until the ball gets reset
+               ball.touch = football_touch; // better than func_null: football control until the ball gets reset
        ball.nextthink = time + autocvar_g_nexball_delay_goal * (self.team != GOAL_OUT);
 }