Don't check the warmup stage to see if armor is enabled on the server. That check...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 8 Jul 2011 14:55:47 +0000 (17:55 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 8 Jul 2011 14:55:47 +0000 (17:55 +0300)
data/qcsrc/server/cl_client.qc

index 8f05815..ef0e2db 100644 (file)
@@ -1047,7 +1047,7 @@ float ClientInit_SendEntity(entity to, float sf)
 \r
        // tell the client if this server uses armor\r
        float armor_enabled;\r
-       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"))\r
+       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"))\r
                armor_enabled = TRUE;\r
        WriteByte(MSG_ENTITY, armor_enabled);\r
 \r