Merge branch 'Mario/buff_timer' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / util.qc

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index d4cbb4fb1da280665f62c00f00dc3b340f251909..817487c6d631d9c023c26d3581abb39244c3f486 100644 (file)
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -85,7 +85,7 @@ void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax
                // apply the damage
                if (ent.takedamage)
                {
-                       Damage (ent, this, this, f_dmg, deathtype, hitloc, force);
+                       Damage (ent, this, this, f_dmg, deathtype, DMG_NOWEP, hitloc, force);
                        ent.velocity = ent.velocity * f_velfactor;
                        //ent.alpha = 0.25 + random() * 0.75;
                }
@@ -97,7 +97,7 @@ void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax
 }
 
 #ifdef TURRET_DEBUG
-void marker_think(entity this, )
+void marker_think(entity this)
 {
        if(this.cnt)
        if(this.cnt < time)
@@ -129,7 +129,7 @@ void mark_error(vector where,float lifetime)
 
 void mark_info(vector where,float lifetime)
 {
-       entity err = spawn(info_marker);
+       entity err = new(info_marker);
        setmodel(err, MDL_MARKER);
        setorigin(err, where);
        set_movetype(err, MOVETYPE_NONE);
@@ -142,7 +142,7 @@ void mark_info(vector where,float lifetime)
 
 entity mark_misc(vector where,float lifetime)
 {
-       entity err = spawn(mark_misc);
+       entity err = new(mark_misc);
        setmodel(err, MDL_MARKER);
        setorigin(err, where);
        set_movetype(err, MOVETYPE_NONE);