X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qh;h=27d1bd0dda0afc7f395b2c0233821207603d3178;hb=d3e3998de013c5293d7931e8db2e463eb11f56f7;hp=cd1ec2e15be6dc19b9ac2fe52507203c4d85bb49;hpb=117fa45380851579df9e6c465a207d733f6ca748;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qh b/qcsrc/server/cl_player.qh
index cd1ec2e15..27d1bd0dd 100644
--- a/qcsrc/server/cl_player.qh
+++ b/qcsrc/server/cl_player.qh
@@ -26,7 +26,7 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int de
 #define GAMETYPE_DEFAULTED_SETTING(str) \
 	((gametype_setting_tmp = cvar(strcat("g_", GetGametype(), "_" #str))), \
 	 (gametype_setting_tmp < 0) ? 0 : \
-	 (gametype_setting_tmp == 0) ? max(0, autocvar_g_##str) : \
+	 (gametype_setting_tmp == 0 || autocvar_g_respawn_delay_forced) ? max(0, autocvar_g_##str) : \
 	 gametype_setting_tmp)