Apply commit 9f2347b8dc on the updated master: CA: ignore respawn settings (delay...

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 5f2289c18d28c3c17eafa2f7339592e985e3dbc9..c19be7fbd6a1ddbd32220323b4a6f0b2a326e643 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -336,6 +336,9 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
 
 void calculate_player_respawn_time()
 {
+       if(g_ca)
+               return;
+
        float gametype_setting_tmp;
        float sdelay_max = GAMETYPE_DEFAULTED_SETTING(respawn_delay_max);
        float sdelay_small = GAMETYPE_DEFAULTED_SETTING(respawn_delay_small);