]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Only use g_respawn_delay_max if it's higher than normal respawn delay
authorMario <mario.mario@y7mail.com>
Thu, 6 Jun 2013 00:48:24 +0000 (10:48 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 6 Jun 2013 00:48:24 +0000 (10:48 +1000)
qcsrc/server/cl_player.qc

index feb63e8472cb54b80a24082a85dd55fb7adc1028..22c3bbb4fbff20b0b466061f58d1d0d3ba39b42b 100644 (file)
@@ -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;