no ready restart counter in ca, fix bot behaviour when warmup is enabled in ca, new...

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

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index ee4ce1b87ed9388ca2bf376f98a437866ef21bc3..0c9d769e4c9973ab471d3d65b0b28253b10fabf4 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -122,10 +122,14 @@ void reset_map(float dorespawn)
        if(g_keyhunt)
                kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round")+(game_starttime - time), "", kh_StartRound);
 
-       if(g_arena || g_ca)
+       if(g_arena)
        if(champion && champion.classname == "player" && player_count > 1)
                UpdateFrags(champion, +1);
 
+       if(g_ca)
+       if(champion && champion.classname == "player" && player_count > 1)
+               TeamScore_AddToTeam(champion.team, SP_SCORE, 1);
+
        self = oldself;
 }
 
@@ -199,7 +203,7 @@ void Arena_Warmup()
 
        allowed_to_spawn = 0;
 
-       if(g_ca && (ca_players < required_ca_players || inWarmupStage))
+       if(inWarmupStage)
                allowed_to_spawn = 1;
 
        msg = NEWLINES;