From: terencehill <piuntn@gmail.com>
Date: Tue, 3 May 2016 22:32:07 +0000 (+0200)
Subject: Replace autocvar_g_respawn_delay_max check with a more correct one
X-Git-Tag: xonotic-v0.8.2~886^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89059db88d23602bdf51d6f9d049c4eb7fe9d308;p=xonotic%2Fxonotic-data.pk3dir.git

Replace autocvar_g_respawn_delay_max check with a more correct one
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c157530fa..208f53723 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2222,7 +2222,7 @@ void PlayerPreThink ()
 				bool button_pressed = (PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this) || PHYS_INPUT_BUTTON_ATCK2(this) || PHYS_INPUT_BUTTON_HOOK(this) || PHYS_INPUT_BUTTON_USE(this));
 
 				if (this.deadflag == DEAD_DYING) {
-					if ((this.respawn_flags & RESPAWN_FORCE) && !autocvar_g_respawn_delay_max) {
+					if ((this.respawn_flags & RESPAWN_FORCE) && !(this.respawn_time < this.respawn_time_max)) {
 						this.deadflag = DEAD_RESPAWNING;
 					} else if (!button_pressed) {
 						this.deadflag = DEAD_DEAD;
@@ -2249,7 +2249,7 @@ void PlayerPreThink ()
 
 				if (this.respawn_flags & RESPAWN_SILENT)
 					STAT(RESPAWN_TIME, this) = 0;
-				else if ((this.respawn_flags & RESPAWN_FORCE) && autocvar_g_respawn_delay_max)
+				else if ((this.respawn_flags & RESPAWN_FORCE) && this.respawn_time < this.respawn_time_max)
 					STAT(RESPAWN_TIME, this) = this.respawn_time_max;
 				else
 					STAT(RESPAWN_TIME, this) = this.respawn_time;