From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 16 Aug 2019 18:15:34 +0000 (+0200)
Subject: use g_use_ammunition instead of hardcoding unlimited ammo
X-Git-Tag: xonotic-v0.8.5~1385^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7a912e0d583bac6e4aed67a70045d2924a0aff9;p=xonotic%2Fxonotic-data.pk3dir.git

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 41ba2da62..cb9aea5cc 100644
--- 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 ae9b1017a..27ae48a40 100644
--- 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