From f98fa9dc0fb647a00cf85e2f34d3073ea2e8e31a Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 19 Feb 2014 18:39:38 +0100 Subject: [PATCH] Apply commit 9f2347b8dc on the updated master: CA: ignore respawn settings (delay, forced respawn) as dead players can't respawn anyway. --- qcsrc/server/cl_player.qc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 5f2289c18..c19be7fbd 100644 --- 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); -- 2.39.2