r5947 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-24 05:53:12 -0500 (Tue, 24 Feb 2009)
New Revision: 5947

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/server/gamecommand.qc
Log:
fix shotorg adjuster


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-02-24 09:33:13 UTC (rev 5946)
+++ trunk/data/qcsrc/client/Main.qc	2009-02-24 10:53:12 UTC (rev 5947)
@@ -384,7 +384,13 @@
 
 	fs = '1 1 0' * ((coord2d_topright_x - coord2d_topleft_x) / stringwidth(s, FALSE));
 
-	coord2d = coord2d_topleft - '0 1 0' * fs_y;
+	coord2d = coord2d_topleft;
+	if(fs_x < 8)
+	{
+		coord2d_x += (coord2d_topright_x - coord2d_topleft_x) * (1 - 8 / fs_x) * 0.5;
+		fs = '8 8 0';
+	}
+	coord2d_y -= fs_y;
 	coord2d_z = 0;
 	drawstring(coord2d, s, fs, '1 1 1', 1, 0);
 }

Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc	2009-02-24 09:33:13 UTC (rev 5946)
+++ trunk/data/qcsrc/server/gamecommand.qc	2009-02-24 10:53:12 UTC (rev 5947)
@@ -578,6 +578,7 @@
 {
 	float argc;
 	entity client, e;
+	vector v;
 	float entno, i;
 	argc = tokenize_sane(command);
 
@@ -842,11 +843,15 @@
 		i = gettagindex(e, argv(3));
 		if(i)
 		{
+			v = gettaginfo(e, i);
 			print("model ", e.model, " frame ", ftos(e.frame), " tag ", argv(3));
 			print(" index = ", ftos(i));
-			print(" vector = ", vtos(gettaginfo(e, i)), "\n");
+			print(" vector = ", vtos(v), "\n");
 			if(argc >= 6)
-				localcmd(strcat(argv(4), vtos(gettaginfo(e, i)), argv(5), "\n"));
+			{
+				v_y = -v_y;
+				localcmd(strcat(argv(4), vtos(v), argv(5), "\n"));
+			}
 		}
 		else
 			print("bone not found\n");