Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc
index ec0b2b6d773dd35ca7f2d61d5fbe41c6e6bed6d6..5af4c45b7ddc9b7752f5aee5eb8a0c194efe08e5 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc
@@ -299,7 +299,7 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs
        key.takedamage = DAMAGE_YES;
        // let key.team stay
        key.modelindex = kh_key_dropped;
        key.takedamage = DAMAGE_YES;
        // let key.team stay
        key.modelindex = kh_key_dropped;

-       navigation_dynamicgoal_set(key);
+       navigation_dynamicgoal_set(key, key.owner);

        key.kh_previous_owner = key.owner;
        key.kh_previous_owner_playerid = key.owner.playerid;
 }
        key.kh_previous_owner = key.owner;
        key.kh_previous_owner_playerid = key.owner.playerid;
 }


@@ -1264,9 +1264,10 @@ MUTATOR_HOOKFUNCTION(kh, MatchEnd)
        kh_finalize();
 }
 
        kh_finalize();
 }
 

-MUTATOR_HOOKFUNCTION(kh, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
+MUTATOR_HOOKFUNCTION(kh, TeamBalance_CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)

 {
        M_ARGV(0, float) = kh_teams;
 {
        M_ARGV(0, float) = kh_teams;

+       return true;

 }
 
 MUTATOR_HOOKFUNCTION(kh, SpectateCopy)
 }
 
 MUTATOR_HOOKFUNCTION(kh, SpectateCopy)