X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Futil.qc;h=817487c6d631d9c023c26d3581abb39244c3f486;hb=ce491d5d46adc539776d175c258e8e89405689c8;hp=4928262f2f4ef85c355e875c7a1c2097a1bdd58d;hpb=8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index 4928262f2..817487c6d 100644
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -1,3 +1,7 @@
+#include "util.qh"
+
+#ifdef SVQC
+
 /*
 * Update this.tur_shotorg by getting up2date bone info
 * NOTICE this func overwrites the global v_forward, v_right and v_up vectors.
@@ -6,7 +10,7 @@ float turret_tag_fire_update(entity this)
 {
 	if(!this.tur_head)
 	{
-		LOG_DEBUG("Call to turret_tag_fire_update with this.tur_head missing!\n");
+		LOG_DEBUG("Call to turret_tag_fire_update with this.tur_head missing!");
 		this.tur_shotorg = '0 0 0';
 		return false;
 	}
@@ -81,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;
 		}
@@ -93,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)
@@ -115,7 +119,7 @@ void mark_error(vector where,float lifetime)
 	entity err = new(error_marker);
 	setmodel(err, MDL_MARKER);
 	setorigin(err, where);
-	err.movetype = MOVETYPE_NONE;
+	set_movetype(err, MOVETYPE_NONE);
 	setthink(err, marker_think);
 	err.nextthink = time;
 	err.skin = 0;
@@ -125,10 +129,10 @@ 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);
-	err.movetype = MOVETYPE_NONE;
+	set_movetype(err, MOVETYPE_NONE);
 	setthink(err, marker_think);
 	err.nextthink = time;
 	err.skin = 1;
@@ -138,10 +142,10 @@ 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);
-	err.movetype = MOVETYPE_NONE;
+	set_movetype(err, MOVETYPE_NONE);
 	setthink(err, marker_think);
 	err.nextthink = time;
 	err.skin = 3;
@@ -167,7 +171,7 @@ void paint_target(entity onwho, float f_size, vector v_color, float f_time)
 	//setattachment(e,onwho,"");
 	setorigin(e, onwho.origin + '0 0 1');
 	e.alpha = 0.15;
-	e.movetype = MOVETYPE_FLY;
+	set_movetype(e, MOVETYPE_FLY);
 
 	e.velocity = (v_color * 32); // + '0 0 1' * 64;
 
@@ -186,7 +190,7 @@ void paint_target2(entity onwho, float f_size, vector v_color, float f_time)
 
 	setorigin(e, onwho.origin + '0 0 1');
 	e.alpha = 0.15;
-	e.movetype = MOVETYPE_FLY;
+	set_movetype(e, MOVETYPE_FLY);
 
 	e.velocity = (v_color * 32); // + '0 0 1' * 64;
 	e.avelocity_x = -128;
@@ -203,9 +207,11 @@ void paint_target3(vector where, float f_size, vector v_color, float f_time)
 	e.scale = (f_size/512);
 	setsize(e, '0 0 0', '0 0 0');
 	setorigin(e, where + '0 0 1');
-	e.movetype = MOVETYPE_NONE;
+	set_movetype(e, MOVETYPE_NONE);
 	e.velocity = '0 0 0';
 	e.colormod = v_color;
 	SUB_SetFade(e,time,f_time);
 }
 #endif
+
+#endif