X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=5a591e03532d7ab0847c1c2ec656b900abb9c485;hb=222d710d7104a365c69b184f6d1fb5738b9b95e3;hp=143b3be4879d79cc2993a685f275e0a1cc2e0bee;hpb=960db199ba59b839a5043aa9ee8e801b8ceeb115;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 143b3be48..5a591e035 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -96,7 +96,7 @@ void Item_Show (entity e, float mode)
 	}
 	else if((e.flags & FL_WEAPON) && (g_weapon_stay == 3))
 	{
-		// make the item translucent green and not touchable
+		// make the item translucent and not touchable
 		e.model = e.mdl;
 		e.solid = SOLID_TRIGGER; // can STILL be picked up!
 		e.colormod = '0 0 0';
@@ -108,7 +108,7 @@ void Item_Show (entity e, float mode)
 	}
 	else if(g_ghost_items)
 	{
-		// make the item translucent green and not touchable
+		// make the item translucent and not touchable
 		e.model = e.mdl;
 		e.solid = SOLID_NOT;
 		e.colormod = stov(autocvar_g_ghost_items_color);
@@ -123,7 +123,7 @@ void Item_Show (entity e, float mode)
 		// hide the item completely
 		e.model = string_null;
 		e.solid = SOLID_NOT;
-		e.colormod = stov(autocvar_g_ghost_items_color);
+		e.colormod = '0 0 0';
 		e.glowmod = e.colormod;
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;
@@ -395,7 +395,7 @@ float Item_GiveTo(entity item, entity player)
 		}
 
 		if (item.flags & FL_WEAPON)
-		if ((it = item.weapons - (item.weapons & player.weapons)) || g_pickup_weapons_anyway)
+		if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && !(g_weapon_stay == 3 && !e.spawnshieldtime)))
 		{
 			pickedup = TRUE;
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
@@ -735,36 +735,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 			waypoint_spawnforitem(self);
 		}
 
-		if(teams_matter)
-		{
-			if(self.notteam)
-			{
-				print("removed non-teamplay ", self.classname, "\n");
-				startitem_failed = TRUE;
-				remove (self);
-				return;
-			}
-		}
-		else
-		{
-			if(self.notfree)
-			{
-				print("removed non-FFA ", self.classname, "\n");
-				startitem_failed = TRUE;
-				remove (self);
-				return;
-			}
-		}
-
-		if(self.notq3a)
-		{
-			// We aren't TA or something like that, so we keep the Q3A entities
-			print("removed non-Q3A ", self.classname, "\n");
-			startitem_failed = TRUE;
-			remove (self);
-			return;
-		}
-
 		/*
 		 * can't do it that way, as it would break maps
 		 * TODO make a target_give like entity another way, that perhaps has