use g_use_ammunition instead of hardcoding unlimited ammo

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 41ba2da62b0ada5c48b9d9c1baa1dcdcb7074d2a..cb9aea5cc3b3d69206e3cec18587f83a40bdb09e 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -274,7 +274,6 @@ MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
        if(WEP_OVERKILL_RPC.weaponstart > 0) { ok_start_items |= WEPSET(OVERKILL_RPC); }
        if(WEP_OVERKILL_HMG.weaponstart > 0) { ok_start_items |= WEPSET(OVERKILL_HMG); }
 
-       start_items |= IT_UNLIMITED_WEAPON_AMMO;
        start_weapons = warmup_start_weapons = ok_start_items;
 }
 

diff --git a/ruleset-overkill.cfg b/ruleset-overkill.cfg
index ae9b1017afb8918a68fc4d76c60fb727bb0cdb57..27ae48a405b77d7c3e132fdc72eeaa5f1ec36c4f 100644 (file)
--- a/ruleset-overkill.cfg
+++ b/ruleset-overkill.cfg
@@ -8,9 +8,10 @@ exec physicsOverkill.cfg
 exec randomitems-overkill.cfg
 if_dedicated exec help-overkill.cfg
 
-// general gameplay
 g_overkill 1
 
+g_use_ammunition 0
+
 // temporary workaround since overkill has no bal-wep file and insta also uses the secondary cvar
 g_balance_blaster_secondary_force_zscale 1.2