shootfromfixedorigin should override shootfromclient if both are set (makes more...
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Tue, 16 Feb 2010 13:37:04 +0000 (13:37 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Tue, 16 Feb 2010 13:37:04 +0000 (13:37 +0000)
git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8649 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/qcsrc/server/miscfunctions.qc

index 0790d18..9fbac8f 100644 (file)
@@ -2450,10 +2450,6 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
                        vecs_z -= 4;
                }
        }
-       else if (cvar("g_shootfromclient"))
-       {
-               vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2));
-       }
        else if ((s = cvar_string("g_shootfromfixedorigin")) != "")
        {
                v = stov(s);
@@ -2464,6 +2460,10 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
                vecs_y = v_y;
                vecs_z = v_z;
        }
+       else if (cvar("g_shootfromclient"))
+       {
+               vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2));
+       }
        return vecs;
 }