From: Erik Schilling Date: Sat, 1 Sep 2012 18:03:48 +0000 (+0200) Subject: Fixed complex bug that lead to mixing the time between strength and invincible for... X-Git-Tag: xonotic-v0.7.0~255^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5af992c71d375f7b4a25b2ebfff6faf646c526dd;p=xonotic%2Fxonotic-data.pk3dir.git Fixed complex bug that lead to mixing the time between strength and invincible for last one --- diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 9ed5acb92..48b4fdd31 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -667,7 +667,7 @@ float Item_GiveTo(entity item, entity player) pickedup = TRUE; // sound not available // AnnounceTo(player, "speed"); - player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_strength_time; + player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time; } } else