Fix post qc_updates merge fallout
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)
qcsrc/client/laser.qc
qcsrc/server/command/radarmap.qc
qcsrc/server/t_plats.qc

index 91b8bca..a74c668 100644 (file)
@@ -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)
index 118fbd4..73e5108 100644 (file)
@@ -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;
index 22b4cf6..5b9433a 100644 (file)
@@ -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';