Clean out self from most NET_HANDLEs

[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 b0667c89afb0146084749acbfd4e5ba105dbe099..17f42c8115edacd9b24b028c9a1a07ee578bb440 100644 (file)
--- 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)