From febf5a90700c70d6285152915c5ee351dfdb81af Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 9 Dec 2013 17:18:37 +1100 Subject: [PATCH] Fix a missing cvar --- bal-wep-xonotic.cfg | 1 + qcsrc/common/weapons/w_mortar.qc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index a8bb7f5d6..a3c5d2c4b 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -127,6 +127,7 @@ set g_balance_mortar_primary_lifetime 5 set g_balance_mortar_primary_lifetime_stick 0 set g_balance_mortar_primary_radius 120 set g_balance_mortar_primary_refire 0.8 +set g_balance_mortar_secondary_remote_detonateprimary 0 set g_balance_mortar_primary_remote_minbouncecnt 0 set g_balance_mortar_primary_speed 1900 set g_balance_mortar_primary_speed_up 225 diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index 3cd153ecc..e7db52f7a 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -26,6 +26,7 @@ REGISTER_WEAPON( w_cvar(WEP_MORTAR, mortar, MO_BOTH, lifetime_stick) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, radius) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, refire) \ + w_cvar(WEP_MORTAR, mortar, MO_SEC, remote_detonateprimary) \ w_cvar(WEP_MORTAR, mortar, MO_PRI, remote_minbouncecnt) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, speed) \ w_cvar(WEP_MORTAR, mortar, MO_BOTH, speed_up) \ @@ -370,7 +371,7 @@ float w_glauncher(float req) } else if (self.BUTTON_ATCK2) { - if (cvar("g_balance_mortar_secondary_remote_detonateprimary")) + if(WEP_CVAR_SEC(mortar, remote_detonateprimary)) { nadefound = 0; for(nade = world; (nade = find(nade, classname, "grenade")); ) if(nade.realowner == self) -- 2.39.2