This commit is dedicated to TimePath

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / nexball / nexball.qc

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index d388ec0143b67f705135df51dc913a93b04c318d..cc418df5e4da015f0a5600a41c6b66f5232ed58d 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -2,7 +2,7 @@
 
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-.float metertime;
+.float metertime = _STAT(NB_METERSTART);
 
 int autocvar_g_nexball_goalleadlimit;
 #define autocvar_g_nexball_goallimit cvar("g_nexball_goallimit")
@@ -78,14 +78,14 @@ void LogNB(string mode, entity actor)
        GameLogEcho(s);
 }
 
-void ball_restart(void)
-{SELFPARAM();
-       if(self.owner)
-               DropBall(self, self.owner.origin, '0 0 0');
+void ball_restart(entity this)
+{
+       if(this.owner)
+               DropBall(this, this.owner.origin, '0 0 0');
        ResetBall();
 }
 
-void nexball_setstatus(void)
+void nexball_setstatus()
 {SELFPARAM();
        self.items &= ~IT_KEY1;
        if(self.ballcarried)
@@ -103,7 +103,7 @@ void nexball_setstatus(void)
        }
 }
 
-void relocate_nexball(void)
+void relocate_nexball()
 {SELFPARAM();
        tracebox(self.origin, BALL_MINS, BALL_MAXS, self.origin, true, self);
        if(trace_startsolid)
@@ -120,7 +120,7 @@ void relocate_nexball(void)
        }
 }
 
-void DropOwner(void)
+void DropOwner()
 {SELFPARAM();
        entity ownr;
        ownr = self.owner;
@@ -222,7 +222,7 @@ void DropBall(entity ball, vector org, vector vel)
        ball.owner = world;
 }
 
-void InitBall(void)
+void InitBall()
 {SELFPARAM();
        if(gameover) return;
        self.flags &= ~FL_ONGROUND;
@@ -242,7 +242,7 @@ void InitBall(void)
        LogNB("init", world);
 }
 
-void ResetBall(void)
+void ResetBall()
 {SELFPARAM();
        if(self.cnt < 2)        // step 1
        {
@@ -278,7 +278,7 @@ void ResetBall(void)
        }
 }
 
-void football_touch(void)
+void football_touch()
 {SELFPARAM();
        if(other.solid == SOLID_BSP)
        {
@@ -324,7 +324,7 @@ void football_touch(void)
        self.avelocity = -250 * v_forward;  // maybe there is a way to make it look better?
 }
 
-void basketball_touch(void)
+void basketball_touch()
 {SELFPARAM();
        if(other.ballcarried)
        {
@@ -346,7 +346,7 @@ void basketball_touch(void)
        }
 }
 
-void GoalTouch(void)
+void GoalTouch()
 {SELFPARAM();
        entity ball;
        float isclient, pscore, otherteam;
@@ -458,7 +458,7 @@ void nb_spawnteam(string teamname, float teamcolor)
        nb_teams += 1;
 }
 
-void nb_spawnteams(void)
+void nb_spawnteams()
 {
        bool t_red = false, t_blue = false, t_yellow = false, t_pink = false;
        entity e;
@@ -498,7 +498,7 @@ void nb_spawnteams(void)
        }
 }
 
-void nb_delayedinit(void)
+void nb_delayedinit()
 {
        if(find(world, classname, "nexball_team") == world)
                nb_spawnteams();
@@ -510,7 +510,7 @@ void nb_delayedinit(void)
 //       spawnfuncs       //
 //=======================//
 
-void SpawnBall(void)
+void SpawnBall()
 {SELFPARAM();
        if(!g_nexball) { remove(self); return; }
 
@@ -606,7 +606,7 @@ float nb_Goal_Customize()
        return true;
 }
 
-void SpawnGoal(void)
+void SpawnGoal()
 {SELFPARAM();
        if(!g_nexball) { remove(self); return; }
 
@@ -717,7 +717,7 @@ void W_Nexball_Think()
        self.nextthink = time;
 }
 
-void W_Nexball_Touch(void)
+void W_Nexball_Touch()
 {SELFPARAM();
        entity ball, attacker;
        attacker = self.owner;
@@ -786,7 +786,7 @@ void W_Nexball_Attack(float t)
 
 vector trigger_push_calculatevelocity(vector org, entity tgt, float ht);
 
-void W_Nexball_Attack2(void)
+void W_Nexball_Attack2()
 {SELFPARAM();
        if(self.ballcarried.enemy)
        {
@@ -816,7 +816,7 @@ void W_Nexball_Attack2(void)
        W_SetupProjVelocity_Basic(missile, autocvar_g_balance_nexball_secondary_speed, 0);
        missile.angles = vectoangles(missile.velocity);
        missile.touch = W_Nexball_Touch;
-       missile.think = SUB_Remove;
+       missile.think = SUB_Remove_self;
        missile.nextthink = time + autocvar_g_balance_nexball_secondary_lifetime; //FIXME: use a distance instead?
 
        missile.effects = EF_BRIGHTFIELD | EF_LOWPRECISION;
@@ -1072,7 +1072,6 @@ REGISTER_MUTATOR(nb, g_nexball)
                if(g_nexball_meter_period <= 0)
                        g_nexball_meter_period = 2; // avoid division by zero etc. due to silly users
                g_nexball_meter_period = rint(g_nexball_meter_period * 32) / 32; //Round to 1/32ths to send as a byte multiplied by 32
-               addstat(STAT_NB_METERSTART, AS_FLOAT, metertime);
 
                // General settings
                /*