From: Mario <mario@smbclan.net>
Date: Fri, 30 Aug 2019 17:31:04 +0000 (+1000)
Subject: Don't replace bullets with shells when sv_q3acompat_machineshotgunswap is enabled
X-Git-Tag: xonotic-v0.8.5~1342
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=593502fda4439d27a13f14720c081c63cd232558;p=xonotic%2Fxonotic-data.pk3dir.git

Don't replace bullets with shells when sv_q3acompat_machineshotgunswap is enabled
---

diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc
index 3a13a1f81..739d94aca 100644
--- a/qcsrc/common/items/item/ammo.qc
+++ b/qcsrc/common/items/item/ammo.qc
@@ -2,15 +2,6 @@
 
 #ifdef SVQC
 
-METHOD(Bullets, m_spawnfunc_hookreplace, GameItem(Bullets this, entity e))
-{
-	if (autocvar_sv_q3acompat_machineshotgunswap && !Item_IsLoot(e))
-	{
-		return ITEM_Shells;
-	}
-	return this;
-}
-
 METHOD(Shells, m_spawnfunc_hookreplace, GameItem(Shells this, entity e))
 {
 	if (autocvar_sv_q3acompat_machineshotgunswap && !Item_IsLoot(e))