From: MirceaKitsune Date: Fri, 8 Jul 2011 14:55:47 +0000 (+0300) Subject: Don't check the warmup stage to see if armor is enabled on the server. That check... X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=bf4e860b86a42ebe1d418ae3de97fcbe92d5300c Don't check the warmup stage to see if armor is enabled on the server. That check is only sent once, so the client doesn't really see when the warmup stage has ended. --- diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 8f058155..ef0e2db0 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1047,7 +1047,7 @@ float ClientInit_SendEntity(entity to, float sf) // tell the client if this server uses armor float armor_enabled; - if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) || (inWarmupStage && cvar("g_warmup_start_armor")) || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear")) + if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) /*|| (inWarmupStage && cvar("g_warmup_start_armor"))*/ || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear")) armor_enabled = TRUE; WriteByte(MSG_ENTITY, armor_enabled);