[nexuiz-commits] r8649 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Feb 16 08:37:05 EST 2010
Author: div0
Date: 2010-02-16 08:37:04 -0500 (Tue, 16 Feb 2010)
New Revision: 8649
Modified:
trunk/data/qcsrc/server/miscfunctions.qc
Log:
shootfromfixedorigin should override shootfromclient if both are set (makes more sense)
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2010-02-15 17:30:24 UTC (rev 8648)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2010-02-16 13:37:04 UTC (rev 8649)
@@ -2450,10 +2450,6 @@
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 @@
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;
}
More information about the nexuiz-commits
mailing list