[nexuiz-commits] r6346 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-28 12:12:06 -0400 (Sat, 28 Mar 2009)
New Revision: 6346

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/g_hook.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
g_shootfromfixedorigin cvar (fixed shotorg)


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-28 16:06:09 UTC (rev 6345)
+++ trunk/data/defaultNexuiz.cfg	2009-03-28 16:12:06 UTC (rev 6346)
@@ -24,7 +24,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default c57e95e5c45c75494b2b35e5edaad80c
+set cvar_check_default 11669b91ec9e0214a0e0ac37a3573c1a
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -395,6 +395,7 @@
 set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)"
 set g_shootfromeye 0
 set g_shootfromcenter 0
+set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used"
 set g_pinata 0
 set g_weapon_stay 0
 set g_powerup_superhealth 1

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-03-28 16:06:09 UTC (rev 6345)
+++ trunk/data/qcsrc/server/constants.qh	2009-03-28 16:12:06 UTC (rev 6346)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "c57e95e5c45c75494b2b35e5edaad80c";
+string CVAR_CHECK_DEFAULT = "11669b91ec9e0214a0e0ac37a3573c1a";
 string CVAR_CHECK_WEAPONS = "6dd73b6c78519153d50f876be23bfe77";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc	2009-03-28 16:06:09 UTC (rev 6345)
+++ trunk/data/qcsrc/server/g_hook.qc	2009-03-28 16:12:06 UTC (rev 6346)
@@ -470,7 +470,7 @@
 	if(g_grappling_hook)
 		hook_shotorigin = '8 -8 -12';
 	else
-		hook_shotorigin = shotorg_adjust('26.2148 9.2059 -15.9772', FALSE, FALSE);
+		hook_shotorigin = shotorg_adjust('26.2148 9.2059 -15.9772', TRUE, FALSE);
 }
 
 void SetGrappleHookBindings()

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-03-28 16:06:09 UTC (rev 6345)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-03-28 16:12:06 UTC (rev 6346)
@@ -2042,6 +2042,8 @@
 
 vector shotorg_adjust(vector vecs, float y_is_right, float visual)
 {
+	string s;
+	vector v;
 	if (cvar("g_shootfromeye"))
 	{
 		if(visual)
@@ -2060,6 +2062,16 @@
 		vecs_y = 0;
 		vecs_z -= 4;
 	}
+	else if((s = cvar_string("g_shootfromfixedorigin")) != "")
+	{
+		v = stov(s);
+		if(y_is_right)
+			v_y = -v_y;
+		if(v_x != 0)
+			vecs_x = v_x;
+		vecs_y = v_y;
+		vecs_z = v_z;
+	}
 	return vecs;
 }