Remove redundant .team initialization in MUTATOR_HOOKFUNCTION(ca, reset_map_players...

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

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 1b8f68e7ea83fe6d8a671cd0097c73b8e0297512..7803108c6c00010cb896fce7fde81da0fbfebc00 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@ -158,7 +158,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerSpawn)
 
        INGAME_STATUS_SET(player, INGAME_STATUS_JOINED);
        if (time <= game_starttime) // reset on game restart, not on round start
-               player.ca_damage_counter = autocvar_g_ca_damage2score / 2; // for rounding purposes
+               player.ca_damage_counter = 0;
        if (!warmup_stage)
                eliminatedPlayers.SendFlags |= 1;
 }
@@ -194,12 +194,7 @@ MUTATOR_HOOKFUNCTION(ca, reset_map_players)
 {
        FOREACH_CLIENT(true, {
                CS(it).killcount = 0;
-               if (!INGAME(it) && IS_BOT_CLIENT(it))
-               {
-                       it.team = -1;
-                       INGAME_STATUS_SET(it, INGAME_STATUS_JOINED);
-               }
-               if (INGAME(it))
+               if (INGAME(it) || IS_BOT_CLIENT(it))
                {
                        TRANSMUTE(Player, it);
                        INGAME_STATUS_SET(it, INGAME_STATUS_JOINED);
@@ -263,11 +258,6 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies)
        return true;
 }
 
-MUTATOR_HOOKFUNCTION(ca, ClientConnect)
-{
-       entity player = M_ARGV(0, entity);
-       player.ca_damage_counter = autocvar_g_ca_damage2score / 2; // for rounding purposes
-}
 
 MUTATOR_HOOKFUNCTION(ca, ClientDisconnect)
 {
@@ -409,18 +399,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDamage_SplitHealthArmor)
        }
 
        if (scorer)
-       {
-               scorer.ca_damage_counter += scorer_damage;
-               if (fabs(scorer.ca_damage_counter) < autocvar_g_ca_damage2score)
-                       return;
-               // NOTE: here we are actually rounding since ca_damage_counter is
-               // initialized on player spawn to half autocvar_g_ca_damage2score
-               // Also note that this code works for subtracting score too
-               int points = floor(scorer.ca_damage_counter / autocvar_g_ca_damage2score);
-               GameRules_scoring_add(scorer, SCORE, points);
-
-               scorer.ca_damage_counter -= points * autocvar_g_ca_damage2score;
-       }
+               GameRules_scoring_add_float2int(scorer, SCORE, scorer_damage, ca_damage_counter, autocvar_g_ca_damage2score);
 }
 
 MUTATOR_HOOKFUNCTION(ca, CalculateRespawnTime)