Merge branch 'master' into terencehill/lms_spec

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / movetypes / follow.qc

diff --git a/qcsrc/common/physics/movetypes/follow.qc b/qcsrc/common/physics/movetypes/follow.qc
index 421c0e73f62daa67a65cef9f14d98fe191eeaefe..9c5468fa11e05a22f7f49c2f6c805d28da7c7d42 100644 (file)
--- a/qcsrc/common/physics/movetypes/follow.qc
+++ b/qcsrc/common/physics/movetypes/follow.qc
@@ -1,10 +1,12 @@
+#include "follow.qh"
+
 void _Movetype_Physics_Follow(entity this) // SV_Physics_Follow
 {
        entity e = this.aiment;
 
        if(e.angles == this.punchangle)
        {
-               this.move_origin = e.origin + this.view_ofs;
+               this.origin = e.origin + this.view_ofs;
        }
        else
        {
@@ -19,11 +21,11 @@ void _Movetype_Physics_Follow(entity this) // SV_Physics_Follow
                ang = e.angles;
                ang_x = -e.angles_x;
                makevectors(ang);
-               this.move_origin_x = v_x * v_forward_x + v_y * v_forward_y + v_z * v_forward_z + e.origin_x;
-               this.move_origin_x = v_x * v_right_x + v_y * v_right_y + v_z * v_right_z + e.origin_y;
-               this.move_origin_x = v_x * v_up_x + v_y * v_up_y + v_z * v_up_z + e.origin_z;
+               this.origin_x = v_x * v_forward_x + v_y * v_forward_y + v_z * v_forward_z + e.origin_x;
+               this.origin_y = v_x * v_right_x + v_y * v_right_y + v_z * v_right_z + e.origin_y;
+               this.origin_z = v_x * v_up_x + v_y * v_up_y + v_z * v_up_z + e.origin_z;
        }
 
-       this.move_angles = e.angles + this.v_angle;
+       this.angles = e.angles + this.v_angle;
        _Movetype_LinkEdict(this, false);
 }