r6029 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-01 06:28:08 -0500 (Sun, 01 Mar 2009)
New Revision: 6029

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/branch-manager
   branches/nexuiz-2.0/data/qcsrc/client/View.qc
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
   branches/nexuiz-2.0/data/qcsrc/server/t_quake.qc
Log:
r6010 | div0 | 2009-02-27 18:28:58 +0100 (Fri, 27 Feb 2009) | 2 lines
fix race columns
r6011 | div0 | 2009-02-27 18:36:39 +0100 (Fri, 27 Feb 2009) | 2 lines
fix some warning prints


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/.patchsets	2009-03-01 11:28:08 UTC (rev 6029)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6008,6026-6026
+revisions_applied = 1-6008,6010-6011,6026-6026

Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/branch-manager	2009-03-01 11:28:08 UTC (rev 6029)
@@ -272,6 +272,7 @@
 	open my $fh, '>>', '.commitmsg'
 		or die "open .commitmsg";
 	print $fh GetLog $first, $last;
+	print $fh "\n";
 	close $fh;
 
 	WriteSettings();

Modified: branches/nexuiz-2.0/data/qcsrc/client/View.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/View.qc	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/data/qcsrc/client/View.qc	2009-03-01 11:28:08 UTC (rev 6029)
@@ -571,7 +571,7 @@
 }
 
 // following vectors must be global to allow seamless switching between camera modes
-vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, camera_position, current_position;
+vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, current_position;
 void CSQC_Demo_Camera()
 {
 	float speed, attenuation, dimensions;

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-03-01 11:28:08 UTC (rev 6029)
@@ -356,19 +356,19 @@
 {
 	return strcat( // fteqcc sucks
 		"ping pl name | ",
-		"-teams,race,lms/kills -teams,race,lms/deaths -teams,lms/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
+		"-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
 		"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
 		"+lms/lives +lms/rank ",
 		"+kh/caps +kh/pushes +kh/destroyed ",
-		"+race/laps +race/time +race/fastest ",
+		"?+race/laps ?+race/time ?+race/fastest ",
 		"+as/objectives ",
-		"-lms/score");
+		"-lms,race/score");
 }
 
 void Cmd_Sbar_SetFields(float argc)
 {
 	float i, j, slash;
-	string str, pattern, subpattern, subpattern2;
+	string str, pattern;
 	float digit;
 	float have_name, have_primary, have_secondary, have_separator;
 	float missing;
@@ -410,8 +410,16 @@
 
 	for(i = 0; i < argc - 1; ++i)
 	{
+		float nocomplain;
 		str = argv(i+1);
 
+		nocomplain = FALSE;
+		if(substring(str, 0, 1) == "?")
+		{
+			nocomplain = TRUE;
+			str = substring(str, 1, strlen(str) - 1);
+		}
+
 		slash = strstrofs(str, "/", 0);
 		if(slash >= 0)
 		{
@@ -451,7 +459,8 @@
 			}
 			else
 			{
-				print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
+				if not(nocomplain)
+					print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
 				continue;
 			}
 :found
@@ -1693,7 +1702,6 @@
 void Sbar_DrawPressedKeys(void)
 {
 	vector pos, bgsize;
-	float center_y;
 	float pressedkeys;
 	
 	pos = stov(cvar_string("cl_showpressedkeys_position"));

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-03-01 11:28:08 UTC (rev 6029)
@@ -434,6 +434,7 @@
 
 	Map_MarkAsRecent(mapname);
 
+	precache_model ("null"); // we need this one before InitGameplayMode
 	InitGameplayMode();
 	readlevelcvars();
 	GrappleHookInit();

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-03-01 11:28:08 UTC (rev 6029)
@@ -1274,7 +1274,6 @@
 void precache()
 {
 	// gamemode related things
-	precache_model ("null");
 	precache_model ("models/misc/chatbubble.spr");
 	precache_model ("models/misc/teambubble.spr");
 	if (g_runematch)
@@ -1538,7 +1537,7 @@
 		{
 			if((ent == e) || ((ent.classname == "initialize_entity") && (ent.enemy == e)))
 			{
-				print("make_safe_for_remove: getting rid of initializer ", etos(ent), "\n");
+				//print("make_safe_for_remove: getting rid of initializer ", etos(ent), "\n");
 				// skip it in linked list
 				if(prev)
 				{

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_quake.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_quake.qc	2009-03-01 11:27:10 UTC (rev 6028)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_quake.qc	2009-03-01 11:28:08 UTC (rev 6029)
@@ -56,5 +56,11 @@
 	self.cvar_cl_weaponpriorities = "";
 	self.scores = 0;
 	self.teamscores = 0;
+	gettaginfo_parent = 0;
+	gettaginfo_name = "";
+	gettaginfo_offset = '0 0 0';
+	gettaginfo_forward = '0 0 0';
+	gettaginfo_right = '0 0 0';
+	gettaginfo_up = '0 0 0';
 }