Merge branch 'Goodspeed/Naitlee/ChineseLocalizationUpdate' into 'master'

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

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 6a19a435f2a502c05d0e6c8ed39ca7565c3a3601..5e900a603977c0b12cc1eb6d834dd545aa699e6e 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -1101,7 +1101,8 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
        //this.effects |= EF_LOWPRECISION;
 
        // support skinned models for powerups
-       this.skin = def.m_skin;
+       if(!this.skin)
+               this.skin = def.m_skin;
 
        setsize (this, this.pos1 =  def.m_mins, this.pos2 = def.m_maxs);
 
@@ -1161,7 +1162,7 @@ void StartItem(entity this, GameItem def)
        if (def.spawnflags & ITEM_FLAG_MUTATORBLOCKED)
        {
                delete(this);
-               return;
+               return; // TODO does not set startitem_failed
        }
 
        this.classname = def.m_canonical_spawnfunc;