Merge branch 'master' into Lyberta/TeamplayOverhaul

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

diff --git a/qcsrc/common/gamemodes/gamemode/assault/assault.qc b/qcsrc/common/gamemodes/gamemode/assault/assault.qc
index 96017310fc8bce0d6e512d381fcffaa0f3de249f..e7134182e497b95facf46c75d680bc5079dd7348 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/assault/assault.qc
+++ b/qcsrc/common/gamemodes/gamemode/assault/assault.qc
@@ -606,10 +606,10 @@ MUTATOR_HOOKFUNCTION(as, PlayHitsound)
        return (frag_victim.classname == "func_assault_destructible");
 }
 
        return (frag_victim.classname == "func_assault_destructible");
 }
 

-MUTATOR_HOOKFUNCTION(as, CheckAllowedTeams)
+MUTATOR_HOOKFUNCTION(as, TeamBalance_CheckAllowedTeams)

 {
        // assault always has 2 teams
 {
        // assault always has 2 teams

-       c1 = c2 = 0;
+       M_ARGV(0, float) = BIT(0) | BIT(1);

        return true;
 }
 
        return true;
 }