r2824 - in branches/nexuiz-2.0/data/qcsrc: common menu server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Oct 10 17:24:28 EDT 2007


Author: div0
Date: 2007-10-10 17:24:28 -0400 (Wed, 10 Oct 2007)
New Revision: 2824

Modified:
   branches/nexuiz-2.0/data/qcsrc/common/util.qh
   branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc
   branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
   branches/nexuiz-2.0/data/qcsrc/server/builtins.qh
   branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc
Log:
new dprint system


Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qh	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qh	2007-10-10 21:24:28 UTC (rev 2824)
@@ -1,3 +1,13 @@
+// note: this is in util.qh so it is included as early as possible.
+var void(string s, ...) dprint;
+void dprint_null() { }
+void dprint_load()
+{
+	if(cvar("developer") > 0)
+		dprint = print;
+	else
+		dprint = dprint_null;
+}
 
 // this returns a tempstring containing a copy of s with additional \n newlines added, it also replaces \n in the text with a real newline
 // NOTE: s IS allowed to be a tempstring

Modified: branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc	2007-10-10 21:24:28 UTC (rev 2824)
@@ -37,7 +37,7 @@
 const string cvar_defstring(string name) = #89;
 void	cvar_set(string name, string value) = #15;
 
-void	dprint(string text,...) = #16;
+//void	dprint(string text,...) = #16;
 
 // conversion functions
 

Modified: branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/menu.qc	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/menu/menu.qc	2007-10-10 21:24:28 UTC (rev 2824)
@@ -19,6 +19,8 @@
 
 void() m_init =
 {
+	dprint_load();
+
 	// init graphic
 	Gfx_Init();
 
@@ -48,6 +50,8 @@
 
 void() m_frame =
 {
+	dprint_load();
+
 	Timer_Update();
 
 	HostCache_Update();

Modified: branches/nexuiz-2.0/data/qcsrc/server/builtins.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/builtins.qh	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/server/builtins.qh	2007-10-10 21:24:28 UTC (rev 2824)
@@ -23,7 +23,7 @@
 entity	findradius (vector org, float rad)						= #22;
 void	bprint (string s, ...)								= #23;
 //void(entity client, string s) sprint = #24;
-void	dprint (string s, ...)								= #25;
+//void	dprint (string s, ...)								= #25; // aliased in util.qh
 string	ftos (float f)									= #26;
 string	vtos (vector v)									= #27;
 void	coredump (void)									= #28;

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc	2007-10-10 21:24:28 UTC (rev 2824)
@@ -123,6 +123,8 @@
 			shtest_score = self.shtest_accumulator / SHTEST_DELTA;
 			if(shtest_score > 1.2)
 				dprint("TIME PARADOX: shtest for ", self.netname, " said ", ftos(shtest_score), "\n");
+			else if(cvar("developer_shtest"))
+				dprint("okay: shtest for ", self.netname, " said ", ftos(shtest_score), "\n");
 		}
 		self.shtest_next = time + SHTEST_DELTA;
 		self.shtest_accumulator = 0;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-10-10 21:24:28 UTC (rev 2824)
@@ -75,6 +75,8 @@
 {
 	float globhandle, i, n;
 
+	dprint_load(); // load dprint status from cvar
+
 	if(world_already_spawned)
 		error("world already spawned - you may have EXACTLY ONE worldspawn!");
 	world_already_spawned = TRUE;

Modified: branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc	2007-10-10 21:23:52 UTC (rev 2823)
+++ branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc	2007-10-10 21:24:28 UTC (rev 2824)
@@ -148,6 +148,8 @@
 float RedirectionThink();
 void StartFrame (void)
 {
+	dprint_load(); // load dprint status from cvar
+
 	if(RedirectionThink())
 		return;
 




More information about the nexuiz-commits mailing list