Merge branch 'TimePath/entitydebugger' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / damage.qc

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 803b241d09b7529bf4872fb4918c7c8cf7bc6556..1151f2336887a81ef8e0ba5d4e1c935f7522d4df 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -105,10 +105,10 @@ void DamageEffect(vector hitorg, float thedamage, int type, int specnum)
                else { return; } // objects don't bleed
        }
 
-       e = spawn();
+       e = new(damage);
+       make_pure(e);
        setmodel(e, MDL_Null); // necessary to attach and read origin
        setattachment(e, self, gettaginfo_name); // attach to the given bone
-       e.classname = "damage";
        e.owner = self;
        e.cnt = time + life;
        e.team = _particleeffectnum(effectname);
@@ -119,6 +119,7 @@ void DamageEffect(vector hitorg, float thedamage, int type, int specnum)
 
 void Ent_DamageInfo(float isNew)
 {SELFPARAM();
+       make_pure(this);
        float thedamage, rad, edge, thisdmg;
        bool hitplayer = false;
        int species, forcemul;
@@ -320,7 +321,7 @@ void Ent_DamageInfo(float isNew)
                                break;
 
                         case DEATH_TURRET_WALK_MELEE:
-                               sound(self, CH_SHOTS, SND_RIC1, VOL_BASE, ATTEN_MIN);
+                               sound(self, CH_SHOTS, SND_RIC_RANDOM(), VOL_BASE, ATTEN_MIN);
                                pointparticles(EFFECT_TE_SPARK, self.origin, w_backoff * 1000, 1);
                                break;