From: terencehill <piuntn@gmail.com>
Date: Wed, 19 Feb 2014 17:39:38 +0000 (+0100)
Subject: Apply commit 9f2347b8dc on the updated master: CA: ignore respawn settings (delay... 
X-Git-Tag: xonotic-v0.8.0~126^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f98fa9dc0fb647a00cf85e2f34d3073ea2e8e31a;p=xonotic%2Fxonotic-data.pk3dir.git

Apply commit 9f2347b8dc on the updated master: CA: ignore respawn settings (delay, forced respawn) as dead players can't respawn anyway.
---

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);