From: Mario <mario.mario@y7mail.com>
Date: Fri, 30 May 2014 15:07:33 +0000 (+1000)
Subject: Disable ammo buff in melee only mode
X-Git-Tag: xonotic-v0.8.0~171^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5aff30682b3eec74e0110d293290b22071d13240;p=xonotic%2Fxonotic-data.pk3dir.git

Disable ammo buff in melee only mode
---

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 70b5246fb..38d262ca7 100644
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -130,18 +130,27 @@ void buff_Touch()
 	other.buffs |= (self.buffs);
 }
 
+float buff_Available(float buffid)
+{
+	if(buffid == BUFF_AMMO && ((start_items & IT_UNLIMITED_WEAPON_AMMO) || (start_items & IT_UNLIMITED_AMMO) || (cvar("g_melee_only"))))
+		return FALSE;
+
+	if(buffid == BUFF_VAMPIRE && cvar("g_vampire"))
+		return FALSE;
+
+	if(!cvar(strcat("g_buffs_", Buff_Name(buffid))))
+		return FALSE;
+
+	return TRUE;
+}
+
 void buff_NewType(entity ent, float cb)
 {
 	entity e;
 	RandomSelection_Init();
 	for(e = Buff_Type_first; e; e = e.enemy)
+	if(buff_Available(e.items))
 	{
-		if(e.items == BUFF_AMMO && ((start_items & IT_UNLIMITED_WEAPON_AMMO) || (start_items & IT_UNLIMITED_AMMO)))
-			continue;
-		if(e.items == BUFF_VAMPIRE && cvar("g_vampire"))
-			continue;
-		if(!cvar(strcat("g_buffs_", e.netname)))
-			continue;
 		RandomSelection_Add(world, e.items, string_null, 1, 1 / e.count); // if it's already been chosen, give it a lower priority
 		e.count += 1;
 	}
@@ -257,7 +266,7 @@ void buff_Init(entity ent)
 
 	entity oldself = self;
 	self = ent;
-	if(!self.buffs || !cvar(strcat("g_buffs_", Buff_Name(self.buffs))))
+	if(!self.buffs || buff_Available(self.buffs))
 		buff_NewType(self, 0);
 	
 	self.classname = "item_buff";