]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use g_balance_health/armor_limit in GivePlayerStuff.
authorLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 15:53:45 +0000 (18:53 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 15:53:45 +0000 (18:53 +0300)
qcsrc/common/t_items.qc

index 61bc7dc5785a945f1729e63d1bff192ff3e38eab..81f45d6c23432c93d47490164ad5c6d23c674cee 100644 (file)
@@ -655,7 +655,7 @@ void GivePlayerHealth(entity player, float amount)
                return;
        }
        player.health = bound(player.health, player.health + amount,
-                g_pickup_healthmega_max);
+                autocvar_g_balance_health_limit);
        player.pauserothealth_finished = max(player.pauserothealth_finished, time +
                autocvar_g_balance_pause_health_rot);
 }
@@ -667,7 +667,7 @@ void GivePlayerArmor(entity player, float amount)
                return;
        }
        player.armorvalue = bound(player.armorvalue, player.armorvalue + amount,
-                g_pickup_armormega_max);
+                autocvar_g_balance_armor_limit);
        player.pauserotarmor_finished = max(player.pauserotarmor_finished, time +
                autocvar_g_balance_pause_armor_rot);
 }