X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftturrets.qc;h=b74024d508aa09b0bf5dab2b660447aa5f2d5f33;hb=61a847dbaab291d205cc9684b6d1a6e9bdad6375;hp=9dbecd3844b9cc53c95632261d9d5b939f7cfb05;hpb=d3a7bb2616410f0252504af2a84e11fb4dac21a3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 9dbecd384..b74024d50 100644
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -1,7 +1,24 @@
 #include "tturrets.qh"
+#include "_all.qh"
+
+#include "hud.qh"
+#include "movelib.qh"
+#include "movetypes.qh"
+#include "prandom.qh"
+#include "teamradar.qh"
 #include "waypointsprites.qh"
 
-#include "../server/movelib.qh"
+#include "../common/teams.qh"
+
+#include "../server/tturrets/include/turrets_early.qh"
+
+#include "../warpzonelib/anglestransform.qh"
+#include "../warpzonelib/mathlib.qh"
+
+.vector colormod;
+.float cnt;
+.float alpha;
+.float gravity;
 
 string tid2info_base;
 string tid2info_head;
@@ -31,7 +48,6 @@ void turret_precache(int _tid)
         precache_model ("models/turrets/head-gib2.md3");
         precache_model ("models/turrets/head-gib3.md3");
         precache_model ("models/turrets/head-gib4.md3");
-        precache_model ("models/turrets/terrainbase.md3");
         precache_model ("models/turrets/base.md3");
         precache_model ("models/turrets/rocket.md3");
     }
@@ -163,7 +179,7 @@ void turret_remove()
     self.tur_head = world;
 }
 
-.vector glowmod;
+class(Turret) .vector glowmod;
 void turret_changeteam()
 {
 	switch(self.team - 1)
@@ -259,7 +275,7 @@ void turret_draw2d()
         || o.x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right))
         || o.y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)))
             return; // Dont draw wp's for turrets out of view
-        o_z = 0;
+        o.z = 0;
         if(hud != HUD_NORMAL)
         {
             switch(hud)
@@ -338,7 +354,7 @@ void turret_draw2d()
 	|| o.y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)))
 	    return; // Dont draw wp's for turrets out of view
 
-	o_z = 0;
+	o.z = 0;
 
 	float edgedistance_min, crosshairdistance;
 		edgedistance_min = min((o.y - (vid_conheight * waypointsprite_edgeoffset_top)),
@@ -668,8 +684,7 @@ void ent_turret()
 
     if(sf & TNSF_STATUS)
     {
-        float _tmp;
-        _tmp = ReadByte();
+        int _tmp = ReadByte();
         if(_tmp != self.team)
         {
             self.team = _tmp;