X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Futil.qc;h=17f42c8115edacd9b24b028c9a1a07ee578bb440;hb=c97a3c9e3ad9823d193dfc02461fa19d6de70150;hp=53c5fb74df629f2628d3e97216b1ff948b3f2a9a;hpb=5607e279fe7b0dc9f92e15556ed6dc33f17f549c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index 53c5fb74d..17f42c811 100644
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -1,114 +1,3 @@
-/*
-* Return a angle within +/- 360.
-*/
-float anglemods(float v)
-{
-	v = v - 360 * floor(v / 360);
-
-	if(v >= 180)
-		return v - 360;
-	else if(v <= -180)
-		return v + 360;
-	else
-		return v;
-}
-
-/*
-* Return the short angle
-*/
-float shortangle_f(float ang1, float ang2)
-{
-	if(ang1 > ang2)
-	{
-		if(ang1 > 180)
-			return ang1 - 360;
-	}
-	else
-	{
-		if(ang1 < -180)
-			return ang1 + 360;
-	}
-
-	return ang1;
-}
-
-vector shortangle_v(vector ang1, vector ang2)
-{
-	vector vtmp;
-
-	vtmp_x = shortangle_f(ang1_x,ang2_x);
-	vtmp_y = shortangle_f(ang1_y,ang2_y);
-	vtmp_z = shortangle_f(ang1_z,ang2_z);
-
-	return vtmp;
-}
-
-vector shortangle_vxy(vector ang1, vector ang2)
-{
-	vector vtmp = '0 0 0';
-
-	vtmp_x = shortangle_f(ang1_x,ang2_x);
-	vtmp_y = shortangle_f(ang1_y,ang2_y);
-
-	return vtmp;
-}
-
-
-/*
-* Get "real" origin, in worldspace, even if ent is attached to something else.
-*/
-vector real_origin(entity ent)
-{
-	entity e;
-	vector v = ((ent.absmin + ent.absmax) * 0.5);
-
-	e = ent.tag_entity;
-	while(e)
-	{
-		v = v + ((e.absmin + e.absmax) * 0.5);
-		e = e.tag_entity;
-	}
-
-	return v;
-}
-
-/*
-* Return the angle between two enteties
-*/
-vector angleofs(entity from, entity to)
-{
-	vector v_res;
-
-	v_res = normalize(to.origin - from.origin);
-	v_res = vectoangles(v_res);
-	v_res = v_res - from.angles;
-
-	if (v_res_x < 0) 	v_res_x += 360;
-	if (v_res_x > 180) 	v_res_x -= 360;
-
-	if (v_res_y < 0) 	v_res_y += 360;
-	if (v_res_y > 180) 	v_res_y -= 360;
-
-	return v_res;
-}
-
-vector angleofs3(vector from, vector from_a, entity to)
-{
-	vector v_res;
-
-	v_res = normalize(to.origin - from);
-	v_res = vectoangles(v_res);
-	v_res = v_res - from_a;
-
-	if (v_res_x < 0) 	v_res_x += 360;
-	if (v_res_x > 180) 	v_res_x -= 360;
-
-	if (v_res_y < 0) 	v_res_y += 360;
-	if (v_res_y > 180) 	v_res_y -= 360;
-
-	return v_res;
-}
-
 /*
 * Update self.tur_shotorg by getting up2date bone info
 * NOTICE this func overwrites the global v_forward, v_right and v_up vectors.
@@ -204,7 +93,6 @@ void FireImoBeam (vector start, vector end, vector smin, vector smax,
 }
 
 #ifdef TURRET_DEBUG
-void SUB_Remove();
 void marker_think()
 {SELFPARAM();
 	if(self.cnt)
@@ -224,10 +112,7 @@ void marker_think()
 
 void mark_error(vector where,float lifetime)
 {
-	entity err;
-
-	err = spawn();
-	err.classname = "error_marker";
+	entity err = new(error_marker);
 	setmodel(err, MDL_MARKER);
 	setorigin(err,where);
 	err.movetype = MOVETYPE_NONE;
@@ -240,10 +125,7 @@ void mark_error(vector where,float lifetime)
 
 void mark_info(vector where,float lifetime)
 {
-	entity err;
-
-	err = spawn();
-	err.classname = "info_marker";
+	entity err = spawn(info_marker);
 	setmodel(err, MDL_MARKER);
 	setorigin(err,where);
 	err.movetype = MOVETYPE_NONE;
@@ -256,10 +138,7 @@ void mark_info(vector where,float lifetime)
 
 entity mark_misc(vector where,float lifetime)
 {
-	entity err;
-
-	err = spawn();
-	err.classname = "mark_misc";
+	entity err = spawn(mark_misc);
 	setmodel(err, MDL_MARKER);
 	setorigin(err,where);
 	err.movetype = MOVETYPE_NONE;