Merge branch 'mirceakitsune/event_chasecam' of ssh://git.xonotic.org/xonotic-data...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 5cd714b652a64f832e7c03633e40567596f6111f..5a591e03532d7ab0847c1c2ec656b900abb9c485 100644 (file)
--- 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)