Merge branch 'pending-release' into Mario/survival

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

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 6a2d65db2075b19a02a74cbba26adf4f47c8d17b..dc7b110e2cc2857da219b18290871de34cc515f0 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -60,7 +60,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
                                if(wep != WEP_Null)
                                {
                                        entity replacement = spawn();
-                                       copyentity(this, replacement);
+                                       Item_CopyFields(this, replacement);
                                        replacement.m_isreplaced = true;
                                        weapon_defaultspawnfunc(replacement, wep);
                                }
@@ -153,7 +153,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
        if(!this.owner)
                this.glowmod = wpn.wpcolor;
        else
-               this.glowmod = colormapPaletteColor(this.owner.clientcolors & 0x0F, true) * 2;
+               this.glowmod = colormapPaletteColor(this.owner.clientcolors & 0x0F, true);
 
        GameItem def = wpn.m_pickup;
        _StartItem(