Merge remote-tracking branch 'origin/develop'

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 6c14fc3a2bc5c7b4725c759a2cd3f282f0cf2772..6068a799f752892a2d1dc8f86b7d412537c0644c 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -22,7 +22,7 @@ void Casing_Draw()
 {
        if(self.move_flags & FL_ONGROUND)
        {
-               self.move_angles.x = 0;
+               self.move_angles_x = 0;
                self.move_angles_z = 0;
                self.flags &= ~FL_ONGROUND;
        }

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 91b8bca8f11525be871aa6b59f4f1a25184dc4ca..a74c6683a26824b0d9ac091e48012d6fb0258ab1 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -87,16 +87,16 @@ void Ent_Laser()
 
        if(f & 1)
        {
-               self.origin.x = ReadCoord();
-               self.origin.y = ReadCoord();
-               self.origin.z = ReadCoord();
+               self.origin_x = ReadCoord();
+               self.origin_y = ReadCoord();
+               self.origin_z = ReadCoord();
                setorigin(self, self.origin);
        }
        if(f & 8)
        {
-               self.colormod.x = ReadByte() / 255.0;
-               self.colormod.y = ReadByte() / 255.0;
-               self.colormod.z = ReadByte() / 255.0;
+               self.colormod_x = ReadByte() / 255.0;
+               self.colormod_y = ReadByte() / 255.0;
+               self.colormod_z = ReadByte() / 255.0;
                if(f & 0x40)
                        self.alpha = ReadByte() / 255.0;
                else
@@ -117,14 +117,14 @@ void Ent_Laser()
        {
                if(f & 0x80)
                {
-                       self.velocity.x = ReadCoord();
-                       self.velocity.y = ReadCoord();
-                       self.velocity.z = ReadCoord();
+                       self.velocity_x = ReadCoord();
+                       self.velocity_y = ReadCoord();
+                       self.velocity_z = ReadCoord();
                }
                else
                {
-                       self.angles.x = ReadAngle();
-                       self.angles.y = ReadAngle();
+                       self.angles_x = ReadAngle();
+                       self.angles_y = ReadAngle();
                }
        }
        if(f & 4)

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 118fbd4924d6d1d4b2845049bd742a1c31aadb7f..73e5108795525bd072c60cc5bd86bcd58cc25da5 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -414,7 +414,7 @@ float RadarMap_Make(float argc)
                                case "--res": // minor alias
                                case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; }
                                case "--qual": // minor alias
-                               case "--quality": { ++i; radarmapper.size.z = stof(argv(i)); break; }
+                               case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; }
 
                                default:
                                        i = argc;

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index 22b4cf669367989ec5eae02dab576744e923cf4e..5b9433af4f2aac3cd7c64f73840cf64a75a6c9e1 100644 (file)
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -1627,7 +1627,7 @@ void spawnfunc_func_door_rotating()
        else // Z
                self.movedir = '0 1 0';
 
-       if (self.angles.y ==0) self.angles.y = 90;
+       if (self.angles.y ==0) self.angles_y = 90;
 
        self.movedir = self.movedir * self.angles.y;
        self.angles = '0 0 0';