[nexuiz-commits] r7468 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-19 09:08:46 -0400 (Wed, 19 Aug 2009)
New Revision: 7468

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
shootfromeye > shootfromcenter > shootfromclient > rest


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-08-19 13:06:23 UTC (rev 7467)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-08-19 13:08:46 UTC (rev 7468)
@@ -2217,15 +2217,11 @@
 	string s;
 	vector v;
 
-	if (cvar("g_shootfromclient"))
+	if (cvar("g_shootfromeye"))
 	{
-		return shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2));
-	}
-	else if (cvar("g_shootfromeye"))
-	{
 		if (visual)
 		{
-			vecs = return shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+			vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
 		}
 		else
 		{
@@ -2237,7 +2233,7 @@
 	{
 		if (visual)
 		{
-			vecs = return shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+			vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
 		}
 		else
 		{
@@ -2245,6 +2241,10 @@
 			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);