From ac9b4c8b25157a740290179e3d0abf81b45bca84 Mon Sep 17 00:00:00 2001 From: pierow Date: Sun, 31 Jan 2021 18:59:56 -0500 Subject: [PATCH] weaponcfgs update --- main/source/cl_dll/ammo.cpp | 4 +++- main/weaponcfgs/default.cfg | 2 ++ main/weaponcfgs/weapon_acidrocketgun.cfg | 2 +- main/weaponcfgs/weapon_bilebombgun.cfg | 2 +- main/weaponcfgs/weapon_bite2gun.cfg | 2 +- main/weaponcfgs/weapon_bitegun.cfg | 2 +- main/weaponcfgs/weapon_blink.cfg | 2 +- main/weaponcfgs/weapon_charge.cfg | 2 +- main/weaponcfgs/weapon_claws.cfg | 2 +- main/weaponcfgs/weapon_devour.cfg | 2 +- main/weaponcfgs/weapon_divinewind.cfg | 2 +- main/weaponcfgs/weapon_grenade.cfg | 2 +- main/weaponcfgs/weapon_grenadegun.cfg | 2 +- main/weaponcfgs/weapon_healingspray.cfg | 2 +- main/weaponcfgs/weapon_heavymachinegun.cfg | 2 +- main/weaponcfgs/weapon_hivegun.cfg | 2 +- main/weaponcfgs/weapon_knife.cfg | 2 +- main/weaponcfgs/weapon_leap.cfg | 2 +- main/weaponcfgs/weapon_machinegun.cfg | 2 +- main/weaponcfgs/weapon_metabolize.cfg | 2 +- main/weaponcfgs/weapon_mine.cfg | 2 +- main/weaponcfgs/weapon_nukegun.cfg | 2 +- main/weaponcfgs/weapon_parasite.cfg | 2 +- main/weaponcfgs/weapon_pistol.cfg | 2 +- main/weaponcfgs/weapon_primalscream.cfg | 2 +- main/weaponcfgs/weapon_shotgun.cfg | 2 +- main/weaponcfgs/weapon_spikegun.cfg | 2 +- main/weaponcfgs/weapon_spit.cfg | 2 +- main/weaponcfgs/weapon_spore.cfg | 2 +- main/weaponcfgs/weapon_stomp.cfg | 2 +- main/weaponcfgs/weapon_swipe.cfg | 2 +- main/weaponcfgs/weapon_umbra.cfg | 2 +- main/weaponcfgs/weapon_webspinner.cfg | 2 +- main/weaponcfgs/weapon_welder.cfg | 2 +- 34 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 main/weaponcfgs/default.cfg diff --git a/main/source/cl_dll/ammo.cpp b/main/source/cl_dll/ammo.cpp index 43ece802..c0deb1a7 100644 --- a/main/source/cl_dll/ammo.cpp +++ b/main/source/cl_dll/ammo.cpp @@ -697,8 +697,10 @@ void CHudAmmo::Think(void) if (gHUD.GetCurrentWeaponID() != gWR.LastWeaponId) { gWR.LastWeaponId = gHUD.GetCurrentWeaponID(); - WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID()); + ClientCmd("exec weaponcfgs/default.cfg"); + + WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID()); char weapcfg[128]; sprintf(weapcfg, "exec weaponcfgs/%s.cfg", currentWeapon->szName); ClientCmd(weapcfg); diff --git a/main/weaponcfgs/default.cfg b/main/weaponcfgs/default.cfg new file mode 100644 index 00000000..815933ce --- /dev/null +++ b/main/weaponcfgs/default.cfg @@ -0,0 +1,2 @@ +// Enter commands to be executed before swapping to any weapon. Useful for resetting commands that are adjusted in only a small number of weapon configs. +// Commands in other weapon configs are executed after this file and take precedence over these commands. diff --git a/main/weaponcfgs/weapon_acidrocketgun.cfg b/main/weaponcfgs/weapon_acidrocketgun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_acidrocketgun.cfg +++ b/main/weaponcfgs/weapon_acidrocketgun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_bilebombgun.cfg b/main/weaponcfgs/weapon_bilebombgun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_bilebombgun.cfg +++ b/main/weaponcfgs/weapon_bilebombgun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_bite2gun.cfg b/main/weaponcfgs/weapon_bite2gun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_bite2gun.cfg +++ b/main/weaponcfgs/weapon_bite2gun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_bitegun.cfg b/main/weaponcfgs/weapon_bitegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_bitegun.cfg +++ b/main/weaponcfgs/weapon_bitegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_blink.cfg b/main/weaponcfgs/weapon_blink.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_blink.cfg +++ b/main/weaponcfgs/weapon_blink.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_charge.cfg b/main/weaponcfgs/weapon_charge.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_charge.cfg +++ b/main/weaponcfgs/weapon_charge.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_claws.cfg b/main/weaponcfgs/weapon_claws.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_claws.cfg +++ b/main/weaponcfgs/weapon_claws.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_devour.cfg b/main/weaponcfgs/weapon_devour.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_devour.cfg +++ b/main/weaponcfgs/weapon_devour.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_divinewind.cfg b/main/weaponcfgs/weapon_divinewind.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_divinewind.cfg +++ b/main/weaponcfgs/weapon_divinewind.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_grenade.cfg b/main/weaponcfgs/weapon_grenade.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_grenade.cfg +++ b/main/weaponcfgs/weapon_grenade.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_grenadegun.cfg b/main/weaponcfgs/weapon_grenadegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_grenadegun.cfg +++ b/main/weaponcfgs/weapon_grenadegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_healingspray.cfg b/main/weaponcfgs/weapon_healingspray.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_healingspray.cfg +++ b/main/weaponcfgs/weapon_healingspray.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_heavymachinegun.cfg b/main/weaponcfgs/weapon_heavymachinegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_heavymachinegun.cfg +++ b/main/weaponcfgs/weapon_heavymachinegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_hivegun.cfg b/main/weaponcfgs/weapon_hivegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_hivegun.cfg +++ b/main/weaponcfgs/weapon_hivegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_knife.cfg b/main/weaponcfgs/weapon_knife.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_knife.cfg +++ b/main/weaponcfgs/weapon_knife.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_leap.cfg b/main/weaponcfgs/weapon_leap.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_leap.cfg +++ b/main/weaponcfgs/weapon_leap.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_machinegun.cfg b/main/weaponcfgs/weapon_machinegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_machinegun.cfg +++ b/main/weaponcfgs/weapon_machinegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_metabolize.cfg b/main/weaponcfgs/weapon_metabolize.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_metabolize.cfg +++ b/main/weaponcfgs/weapon_metabolize.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_mine.cfg b/main/weaponcfgs/weapon_mine.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_mine.cfg +++ b/main/weaponcfgs/weapon_mine.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_nukegun.cfg b/main/weaponcfgs/weapon_nukegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_nukegun.cfg +++ b/main/weaponcfgs/weapon_nukegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_parasite.cfg b/main/weaponcfgs/weapon_parasite.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_parasite.cfg +++ b/main/weaponcfgs/weapon_parasite.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_pistol.cfg b/main/weaponcfgs/weapon_pistol.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_pistol.cfg +++ b/main/weaponcfgs/weapon_pistol.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_primalscream.cfg b/main/weaponcfgs/weapon_primalscream.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_primalscream.cfg +++ b/main/weaponcfgs/weapon_primalscream.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_shotgun.cfg b/main/weaponcfgs/weapon_shotgun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_shotgun.cfg +++ b/main/weaponcfgs/weapon_shotgun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_spikegun.cfg b/main/weaponcfgs/weapon_spikegun.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_spikegun.cfg +++ b/main/weaponcfgs/weapon_spikegun.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_spit.cfg b/main/weaponcfgs/weapon_spit.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_spit.cfg +++ b/main/weaponcfgs/weapon_spit.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_spore.cfg b/main/weaponcfgs/weapon_spore.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_spore.cfg +++ b/main/weaponcfgs/weapon_spore.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_stomp.cfg b/main/weaponcfgs/weapon_stomp.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_stomp.cfg +++ b/main/weaponcfgs/weapon_stomp.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_swipe.cfg b/main/weaponcfgs/weapon_swipe.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_swipe.cfg +++ b/main/weaponcfgs/weapon_swipe.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_umbra.cfg b/main/weaponcfgs/weapon_umbra.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_umbra.cfg +++ b/main/weaponcfgs/weapon_umbra.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_webspinner.cfg b/main/weaponcfgs/weapon_webspinner.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_webspinner.cfg +++ b/main/weaponcfgs/weapon_webspinner.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity. diff --git a/main/weaponcfgs/weapon_welder.cfg b/main/weaponcfgs/weapon_welder.cfg index a804a219..ff5f942a 100644 --- a/main/weaponcfgs/weapon_welder.cfg +++ b/main/weaponcfgs/weapon_welder.cfg @@ -1 +1 @@ -// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity. +// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity.