Rename triggers to mapobjects

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_keepaway.qc

diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
index aeca28fa32de06f157658bb3192a9c33f0ae5b14..567f24b478a47d1e536f731db06af69b190ace97 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
@@ -246,7 +246,7 @@ void havocbot_role_ka_carrier(entity this)
        if (!this.ballcarried)
        {
                this.havocbot_role = havocbot_role_ka_collector;
-               navigation_goalrating_timeout_force(this);
+               navigation_goalrating_timeout_expire(this, 2);
        }
 }
 
@@ -269,7 +269,7 @@ void havocbot_role_ka_collector(entity this)
        if (this.ballcarried)
        {
                this.havocbot_role = havocbot_role_ka_carrier;
-               navigation_goalrating_timeout_force(this);
+               navigation_goalrating_timeout_expire(this, 2);
        }
 }
 
@@ -396,18 +396,14 @@ MUTATOR_HOOKFUNCTION(ka, PlayerPowerups)
                player.effects |= autocvar_g_keepaway_ballcarrier_effects;
 }
 
-.float stat_sv_airspeedlimit_nonqw;
-.float stat_sv_maxspeed;
 
-MUTATOR_HOOKFUNCTION(ka, PlayerPhysics)
+MUTATOR_HOOKFUNCTION(ka, PlayerPhysics_UpdateStats)
 {
        entity player = M_ARGV(0, entity);
+       // these automatically reset, no need to worry
 
        if(player.ballcarried)
-       {
-               player.stat_sv_airspeedlimit_nonqw *= autocvar_g_keepaway_ballcarrier_highspeed;
-               player.stat_sv_maxspeed *= autocvar_g_keepaway_ballcarrier_highspeed;
-       }
+               STAT(MOVEVARS_HIGHSPEED, player) *= autocvar_g_keepaway_ballcarrier_highspeed;
 }
 
 MUTATOR_HOOKFUNCTION(ka, BotShouldAttack)