Replace `vector_[xyz]` with `vector.[xyz]` where possible

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_onslaught.qc

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 74cba2897387862d8893b708cd263c1c8b8c8c69..6cfefdfe5464a0fb92d254db5588a9c0f6df0011 100644 (file)
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1150,54 +1150,54 @@ void onslaught_controlpoint_icon_think()
                self.owner.waslinked = self.owner.islinked;
        }
 
-       if (self.punchangle_x > 0)
+       if (self.punchangle.x > 0)
        {
-               self.punchangle_x = self.punchangle_x - 60 * sys_frametime;
-               if (self.punchangle_x < 0)
+               self.punchangle_x = self.punchangle.x - 60 * sys_frametime;
+               if (self.punchangle.x < 0)
                        self.punchangle_x = 0;
        }
-       else if (self.punchangle_x < 0)
+       else if (self.punchangle.x < 0)
        {
-               self.punchangle_x = self.punchangle_x + 60 * sys_frametime;
-               if (self.punchangle_x > 0)
+               self.punchangle_x = self.punchangle.x + 60 * sys_frametime;
+               if (self.punchangle.x > 0)
                        self.punchangle_x = 0;
        }
 
-       if (self.punchangle_y > 0)
+       if (self.punchangle.y > 0)
        {
-               self.punchangle_y = self.punchangle_y - 60 * sys_frametime;
-               if (self.punchangle_y < 0)
+               self.punchangle_y = self.punchangle.y - 60 * sys_frametime;
+               if (self.punchangle.y < 0)
                        self.punchangle_y = 0;
        }
-       else if (self.punchangle_y < 0)
+       else if (self.punchangle.y < 0)
        {
-               self.punchangle_y = self.punchangle_y + 60 * sys_frametime;
-               if (self.punchangle_y > 0)
+               self.punchangle_y = self.punchangle.y + 60 * sys_frametime;
+               if (self.punchangle.y > 0)
                        self.punchangle_y = 0;
        }
 
-       if (self.punchangle_z > 0)
+       if (self.punchangle.z > 0)
        {
-               self.punchangle_z = self.punchangle_z - 60 * sys_frametime;
-               if (self.punchangle_z < 0)
+               self.punchangle_z = self.punchangle.z - 60 * sys_frametime;
+               if (self.punchangle.z < 0)
                        self.punchangle_z = 0;
        }
-       else if (self.punchangle_z < 0)
+       else if (self.punchangle.z < 0)
        {
-               self.punchangle_z = self.punchangle_z + 60 * sys_frametime;
-               if (self.punchangle_z > 0)
+               self.punchangle_z = self.punchangle.z + 60 * sys_frametime;
+               if (self.punchangle.z > 0)
                        self.punchangle_z = 0;
        }
 
-       self.angles_x = self.punchangle_x;
-       self.angles_y = self.punchangle_y + self.mangle_y;
-       self.angles_z = self.punchangle_z;
-       self.mangle_y = self.mangle_y + 45 * sys_frametime;
+       self.angles_x = self.punchangle.x;
+       self.angles_y = self.punchangle.y + self.mangle.y;
+       self.angles_z = self.punchangle.z;
+       self.mangle_y = self.mangle.y + 45 * sys_frametime;
 
        self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd));
        self.cp_bob_spd = self.cp_bob_spd + 1.875 * sys_frametime;
-       if(self.cp_bob_dmg_z > 0)
-               self.cp_bob_dmg_z = self.cp_bob_dmg_z - 3 * sys_frametime;
+       if(self.cp_bob_dmg.z > 0)
+               self.cp_bob_dmg_z = self.cp_bob_dmg.z - 3 * sys_frametime;
        else
                self.cp_bob_dmg_z = 0;
        setorigin(self,self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg);
@@ -1425,15 +1425,15 @@ float onslaught_link_send(entity to, float sendflags)
        WriteByte(MSG_ENTITY, sendflags);
        if(sendflags & 1)
        {
-               WriteCoord(MSG_ENTITY, self.goalentity.origin_x);
-               WriteCoord(MSG_ENTITY, self.goalentity.origin_y);
-               WriteCoord(MSG_ENTITY, self.goalentity.origin_z);
+               WriteCoord(MSG_ENTITY, self.goalentity.origin.x);
+               WriteCoord(MSG_ENTITY, self.goalentity.origin.y);
+               WriteCoord(MSG_ENTITY, self.goalentity.origin.z);
        }
        if(sendflags & 2)
        {
-               WriteCoord(MSG_ENTITY, self.enemy.origin_x);
-               WriteCoord(MSG_ENTITY, self.enemy.origin_y);
-               WriteCoord(MSG_ENTITY, self.enemy.origin_z);
+               WriteCoord(MSG_ENTITY, self.enemy.origin.x);
+               WriteCoord(MSG_ENTITY, self.enemy.origin.y);
+               WriteCoord(MSG_ENTITY, self.enemy.origin.z);
        }
        if(sendflags & 4)
        {