Merge branch 'master' into TimePath/debug_draw

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

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 71217b9b99fbc6be1c2aa93d7bb16a2cbd2db7d4..49934d62ed94082bea67c0f5b35a9ed06c7f8352 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -443,6 +443,7 @@ void CL_ExteriorWeaponentity_Think()
 void CL_SpawnWeaponentity(entity e, .entity weaponentity)
 {
        entity view = e.(weaponentity) = new(weaponentity);
+       make_pure(view);
        view.solid = SOLID_NOT;
        view.owner = e;
        setmodel(view, MDL_Null);  // precision set when changed
@@ -456,8 +457,8 @@ void CL_SpawnWeaponentity(entity e, .entity weaponentity)
 
        if (weaponentity == weaponentities[0])
        {
-               entity exterior = e.exteriorweaponentity = spawn();
-               exterior.classname = "exteriorweaponentity";
+               entity exterior = e.exteriorweaponentity = new(exteriorweaponentity);
+               make_pure(exterior);
                exterior.solid = SOLID_NOT;
                exterior.exteriorweaponentity = exterior;
                exterior.owner = e;