From: Mario <mario.mario@y7mail.com>
Date: Thu, 6 Jun 2013 00:48:24 +0000 (+1000)
Subject: Only use g_respawn_delay_max if it's higher than normal respawn delay
X-Git-Tag: xonotic-v0.8.0~258^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e43baf2e8a516a8f2f12aa19b603a8e4f8d6243;p=xonotic%2Fxonotic-data.pk3dir.git

Only use g_respawn_delay_max if it's higher than normal respawn delay
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index feb63e847..22c3bbb4f 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -650,7 +650,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			self.respawn_time = ceil((time + sdelay) / waves) * waves;
 		else
 			self.respawn_time = time + sdelay;
-		if(autocvar_g_respawn_delay_max)
+		if(autocvar_g_respawn_delay_max > self.respawn_time)
 			self.respawn_time_max = time + autocvar_g_respawn_delay_max;
 		else
 			self.respawn_time_max = self.respawn_time;