Merge branch 'master' into terencehill/glowmod_color_fix

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

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index df20e1ad2f2d8371638de205f191a458be3db41e..5c309ece8012806f50245ee1583f6d991c880cbe 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -1,4 +1,5 @@
 #include "cl_turrets.qh"
+
 void turret_remove(entity this)
 {
        delete(this.tur_head);
@@ -9,7 +10,7 @@ void turret_remove(entity this)
 .vector glowmod;
 void turret_changeteam(entity this)
 {
-       this.glowmod = Team_ColorRGB(this.team - 1) * 2;
+       this.glowmod = Team_ColorRGB(this.team - 1);
        this.teamradar_color = Team_ColorRGB(this.team - 1);
 
        if(this.team)
@@ -376,8 +377,7 @@ NET_HANDLE(ENT_CLIENT_TURRET, bool isnew)
                this.origin = ReadVector();
                setorigin(this, this.origin);
 
-               this.angles_x = ReadAngle();
-               this.angles_y = ReadAngle();
+               this.angles = ReadAngleVector2D();
 
                turret_construct(this, isnew);
                this.colormap = 1024;