From: Mario <mario.mario@y7mail.com>
Date: Wed, 23 Oct 2013 08:58:54 +0000 (+1100)
Subject: Fix some issues brought up in the tracker
X-Git-Tag: xonotic-v0.8.0~258^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b8cf8f401e34912a9ce0e77f2e924cba896a683;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some issues brought up in the tracker
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c08452402..687f22aba 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -465,7 +465,7 @@ set g_spawn_furthest 1 "this amount of the spawns shall be far away from any pla
 set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
 // respawn delay
 set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
-set g_respawn_delay_max 5 "number of seconds you can wait before you're forced to respawn (only effective with g_forced_respawn 1)"
+set g_respawn_delay_max 0 "number of seconds you can wait before you're forced to respawn (only effective with g_forced_respawn 1)"
 set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
 
 // overtime
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 24e8f5a52..0c71bcc9e 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2308,7 +2308,7 @@ void PlayerPreThink (void)
 				
 				if (self.deadflag == DEAD_DYING)
 				{
-					if(self.respawn_flags & RESPAWN_FORCE && !autocvar_g_respawn_delay_max)
+					if((self.respawn_flags & RESPAWN_FORCE) && !autocvar_g_respawn_delay_max)
 						self.deadflag = DEAD_RESPAWNING;
 					else if(!button_pressed)
 						self.deadflag = DEAD_DEAD;
@@ -2317,7 +2317,7 @@ void PlayerPreThink (void)
 				{
 					if(button_pressed)
 						self.deadflag = DEAD_RESPAWNABLE;
-					else if(time >= self.respawn_time_max && self.respawn_flags & RESPAWN_FORCE)
+					else if(time >= self.respawn_time_max && (self.respawn_flags & RESPAWN_FORCE))
 						self.deadflag = DEAD_RESPAWNING;
 				}
 				else if (self.deadflag == DEAD_RESPAWNABLE)
@@ -2339,7 +2339,7 @@ void PlayerPreThink (void)
 
 				if(self.respawn_flags & RESPAWN_SILENT)
 					self.stat_respawn_time = 0;
-				else if(self.respawn_flags & RESPAWN_FORCE && autocvar_g_respawn_delay_max)
+				else if((self.respawn_flags & RESPAWN_FORCE) && autocvar_g_respawn_delay_max)
 					self.stat_respawn_time = self.respawn_time_max;
 				else
 					self.stat_respawn_time = self.respawn_time;
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 4d62dc2ee..8818c30ea 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -637,7 +637,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 > self.respawn_time)
+		if(autocvar_g_respawn_delay_max > sdelay)
 			self.respawn_time_max = time + autocvar_g_respawn_delay_max;
 		else
 			self.respawn_time_max = self.respawn_time;