Fix some issues brought up in the tracker

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c08452402d91564daac7734c35b85af0d31a8e14..687f22aba32bee81dfee054b0602bea013983ff5 100644 (file)
--- 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 24e8f5a528aca83bcc3b91892bc7f64a983e909a..0c71bcc9e703da9511576b4b213f8eb2dc5c01d6 100644 (file)
--- 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 4d62dc2eea5789803fd76c2e1e6368908ac9214c..8818c30eadc57cb31d03d2b479e8f7844771575e 100644 (file)
--- 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;