X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=a5d3490a459186e0ff8fa71d9e57905dad91354d;hp=5587da593796e32e6e6afee3d91d84ec4ac14a18;hb=7f042267d93f57719b68f0725af14d444f5c8932;hpb=ac9fba402abf745436adf0ecaa8f90347708ff53

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 5587da5937..a5d3490a45 100644
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -231,6 +231,7 @@ void buff_Think(entity this)
 		this.skin = buff.m_skin;
 
 		setmodel(this, MDL_BUFF);
+		setsize(this, BUFF_MIN, BUFF_MAX);
 
 		if(this.buff_waypoint)
 		{
@@ -424,9 +425,9 @@ void buff_Medic_Heal(entity this)
 	});
 }
 
-float buff_Inferno_CalculateTime(float x, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
+float buff_Inferno_CalculateTime(float damg, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
 {
-	return offset_y + (intersect_y - offset_y) * logn(((x - offset_x) * ((base - 1) / intersect_x)) + 1, base);
+	return offset_y + (intersect_y - offset_y) * logn(((damg - offset_x) * ((base - 1) / intersect_x)) + 1, base);
 }
 
 // mutator hooks
@@ -826,7 +827,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 	if(player.buffs & BUFF_MAGNET.m_itemid)
 	{
 		vector pickup_size;
-		IL_EACH(g_items, it.classname != "item_flag_team" && it.classname != "item_kh_key",
+		IL_EACH(g_items, it.itemdef,
 		{
 			if(it.buffs)
 				pickup_size = '1 1 1' * autocvar_g_buffs_magnet_range_buff;
@@ -842,8 +843,14 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 	}
 
 	if(player.buffs & BUFF_AMMO.m_itemid)
-	if(player.clip_size)
-		player.clip_load = player.(weapon_load[PS(player).m_switchweapon.m_id]) = player.clip_size;
+	{
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if(player.(weaponentity).clip_size)
+				player.(weaponentity).clip_load = player.(weaponentity).(weapon_load[player.(weaponentity).m_switchweapon.m_id]) = player.(weaponentity).clip_size;
+		}
+	}
 
 	if((player.buffs & BUFF_INVISIBLE.m_itemid) && (player.oldbuffs & BUFF_INVISIBLE.m_itemid))
 	if(player.alpha != autocvar_g_buffs_invisible_alpha)
@@ -870,9 +877,17 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 			player.buff_ammo_prev_infitems = (player.items & IT_UNLIMITED_WEAPON_AMMO);
 			player.items |= IT_UNLIMITED_WEAPON_AMMO;
 
-			if(player.clip_load)
-				player.buff_ammo_prev_clipload = player.clip_load;
-			player.clip_load = player.(weapon_load[PS(player).m_switchweapon.m_id]) = player.clip_size;
+			if(player.buffs & BUFF_AMMO.m_itemid)
+			{
+				for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+				{
+					.entity weaponentity = weaponentities[slot];
+					if(player.(weaponentity).clip_load)
+						player.(weaponentity).buff_ammo_prev_clipload = player.(weaponentity).clip_load;
+					if(player.(weaponentity).clip_size)
+						player.(weaponentity).clip_load = player.(weaponentity).(weapon_load[player.(weaponentity).m_switchweapon.m_id]) = player.(weaponentity).clip_size;
+				}
+			}
 		}
 
 		BUFF_ONREM(BUFF_AMMO)
@@ -882,8 +897,15 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 			else
 				player.items &= ~IT_UNLIMITED_WEAPON_AMMO;
 
-			if(player.buff_ammo_prev_clipload)
-				player.clip_load = player.buff_ammo_prev_clipload;
+			if(player.buffs & BUFF_AMMO.m_itemid)
+			{
+				for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+				{
+					.entity weaponentity = weaponentities[slot];
+					if(player.(weaponentity).buff_ammo_prev_clipload)
+						player.(weaponentity).clip_load = player.(weaponentity).buff_ammo_prev_clipload;
+				}
+			}
 		}
 
 		BUFF_ONADD(BUFF_INVISIBLE)