From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Nov 2013 04:36:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/respawn_delays'
X-Git-Tag: xonotic-v0.8.0~258
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/respawn_delays'

# By Mario
# Via Mario
* origin/Mario/respawn_delays:
  Fix some issues brought up in the tracker
  Only use g_respawn_delay_max if it's higher than normal respawn delay
  Add a new option for forced respawn: g_respawn_delay_max. Forces players to spawn after this many seconds or optionally respawn after normal delay
---

3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5
diff --cc qcsrc/server/cl_client.qc
index 65443f478,0c71bcc9e..d803602ad
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2305,10 -2305,10 +2305,10 @@@ void PlayerPreThink (void
  				if(frametime)
  					player_anim();
  				button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_HOOK || self.BUTTON_USE);
 -				
 +
  				if (self.deadflag == DEAD_DYING)
  				{
- 					if(self.respawn_flags & RESPAWN_FORCE)
+ 					if((self.respawn_flags & RESPAWN_FORCE) && !autocvar_g_respawn_delay_max)
  						self.deadflag = DEAD_RESPAWNING;
  					else if(!button_pressed)
  						self.deadflag = DEAD_DEAD;