From a1d9b2c54a3d307c5c5c2d5549d50220bbb877ca Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 12 Apr 2019 22:15:17 +0200 Subject: [PATCH] Remove unused turret cvars g_turrets_unit_*_ammo (initial ammo is loaded from g_turrets_unit_*_ammo_max) --- qcsrc/common/turrets/all.qh | 1 - turrets.cfg | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index f87b1a274..58a34477a 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -16,7 +16,6 @@ REGISTRY_CHECK(Turrets) P(class, prefix, aim_maxpitch, float) \ P(class, prefix, aim_maxrot, float) \ P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ P(class, prefix, ammo_max, float) \ P(class, prefix, ammo_recharge, float) \ P(class, prefix, health, float) \ diff --git a/turrets.cfg b/turrets.cfg index 6fc860bd1..882af02f9 100644 --- a/turrets.cfg +++ b/turrets.cfg @@ -40,7 +40,6 @@ set g_turrets_unit_ewheel_target_select_playerbias 1 set g_turrets_unit_ewheel_target_select_missilebias 0 set g_turrets_unit_ewheel_ammo_max 4000 -set g_turrets_unit_ewheel_ammo 500 set g_turrets_unit_ewheel_ammo_recharge 50 set g_turrets_unit_ewheel_aim_firetolerance_dist 150 @@ -78,7 +77,6 @@ set g_turrets_unit_flac_target_select_playerbias 0 set g_turrets_unit_flac_target_select_missilebias 1 set g_turrets_unit_flac_ammo_max 1000 -set g_turrets_unit_flac_ammo 400 set g_turrets_unit_flac_ammo_recharge 100 set g_turrets_unit_flac_aim_firetolerance_dist 150 @@ -103,7 +101,6 @@ set g_turrets_unit_fusreac_target_range 1024 set g_turrets_unit_fusreac_target_range_min 1 set g_turrets_unit_fusreac_ammo_max 100 -set g_turrets_unit_fusreac_ammo 0 set g_turrets_unit_fusreac_ammo_recharge 100 set g_turrets_unit_fusreac_shot_radius 0 @@ -154,7 +151,6 @@ set g_turrets_unit_hellion_target_select_playerbias 1 set g_turrets_unit_hellion_target_select_missilebias 0 set g_turrets_unit_hellion_ammo_max 200 -set g_turrets_unit_hellion_ammo 100 set g_turrets_unit_hellion_ammo_recharge 50 set g_turrets_unit_hellion_aim_firetolerance_dist 200 @@ -198,7 +194,6 @@ set g_turrets_unit_hk_target_select_playerbias 1 set g_turrets_unit_hk_target_select_missilebias 0 set g_turrets_unit_hk_ammo_max 240 -set g_turrets_unit_hk_ammo 120 set g_turrets_unit_hk_ammo_recharge 16 set g_turrets_unit_hk_aim_firetolerance_dist 500 @@ -236,7 +231,6 @@ set g_turrets_unit_machinegun_target_select_playerbias 1 set g_turrets_unit_machinegun_target_select_missilebias 0 set g_turrets_unit_machinegun_ammo_max 1500 -set g_turrets_unit_machinegun_ammo 300 set g_turrets_unit_machinegun_ammo_recharge 75 set g_turrets_unit_machinegun_aim_firetolerance_dist 25 @@ -275,7 +269,6 @@ set g_turrets_unit_mlrs_target_select_playerbias 1 set g_turrets_unit_mlrs_target_select_missilebias 0 set g_turrets_unit_mlrs_ammo_max 300 -set g_turrets_unit_mlrs_ammo 300 set g_turrets_unit_mlrs_ammo_recharge 75 set g_turrets_unit_mlrs_aim_firetolerance_dist 120 @@ -313,7 +306,6 @@ set g_turrets_unit_phaser_target_select_playerbias 1 set g_turrets_unit_phaser_target_select_missilebias 0 set g_turrets_unit_phaser_ammo_max 2000 -set g_turrets_unit_phaser_ammo 1000 set g_turrets_unit_phaser_ammo_recharge 25 set g_turrets_unit_phaser_aim_firetolerance_dist 100 @@ -351,7 +343,6 @@ set g_turrets_unit_plasma_target_select_playerbias 1 set g_turrets_unit_plasma_target_select_missilebias 0 set g_turrets_unit_plasma_ammo_max 640 -set g_turrets_unit_plasma_ammo 320 set g_turrets_unit_plasma_ammo_recharge 40 set g_turrets_unit_plasma_aim_firetolerance_dist 120 @@ -389,7 +380,6 @@ set g_turrets_unit_plasma_dual_target_select_playerbias 1 set g_turrets_unit_plasma_dual_target_select_missilebias 0 set g_turrets_unit_plasma_dual_ammo_max 640 -set g_turrets_unit_plasma_dual_ammo 320 set g_turrets_unit_plasma_dual_ammo_recharge 40 set g_turrets_unit_plasma_dual_aim_firetolerance_dist 200 @@ -421,7 +411,6 @@ set g_turrets_unit_tesla_target_select_playerbias 1 set g_turrets_unit_tesla_target_select_missilebias 1 set g_turrets_unit_tesla_ammo_max 1000 -set g_turrets_unit_tesla_ammo 200 set g_turrets_unit_tesla_ammo_recharge 15 set g_turrets_unit_tesla_shot_radius 0 @@ -478,7 +467,6 @@ set g_turrets_unit_walker_target_select_playerbias 1 set g_turrets_unit_walker_target_select_missilebias 0 set g_turrets_unit_walker_ammo_max 4000 -set g_turrets_unit_walker_ammo 500 set g_turrets_unit_walker_ammo_recharge 100 set g_turrets_unit_walker_aim_firetolerance_dist 100 -- 2.39.2