Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / calculations.qc

diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc
index 7bc64e0b5371c0ddf3fb007257f5f6af34c25480..46bb8a6d45d465879915690e1ef4d51383800903 100644 (file)
--- a/qcsrc/common/weapons/calculations.qc
+++ b/qcsrc/common/weapons/calculations.qc
@@ -129,16 +129,16 @@ vector solve_cubic_abcd(float a, float b, float c, float d)
        v = solve_cubic_pq(p, q);
        v = (v -  b * '1 1 1') * (1.0 / (3.0 * a));
        if(a < 0)
-               v += '1 0 -1' * (v_z - v_x); // swap x, z
+               v += '1 0 -1' * (v.z - v.x); // swap x, z
        return v;
 }
 
 vector findperpendicular(vector v)
 {
        vector p;
-       p_x = v_z;
-       p_y = -v_x;
-       p_z = v_y;
+       p.x = v.z;
+       p.y = -v.x;
+       p.z = v.y;
        return normalize(cliptoplane(p, v));
 }
 
@@ -152,7 +152,7 @@ vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float
        if(spread <= 0)
                return forward;
        sstyle = spreadstyle; //autocvar_g_projectiles_spread_style;
-       
+
        if(sstyle == 0)
        {
                // this is the baseline for the spread value!