[nexuiz-commits] r8462 - in trunk/data/qcsrc: client common menu server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Dec 29 01:37:58 EST 2009


Author: div0
Date: 2009-12-29 01:37:57 -0500 (Tue, 29 Dec 2009)
New Revision: 8462

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/csqc_builtins.qc
   trunk/data/qcsrc/common/util.qh
   trunk/data/qcsrc/menu/mbuiltin.qh
   trunk/data/qcsrc/menu/menu.qc
   trunk/data/qcsrc/server/builtins.qh
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/sv_main.qc
Log:
undo the dprint optimization that saved on builtin calls because dprints now should ALWAYS print to the engine, and are just hidden from the console buffer


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/client/Main.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -61,7 +61,6 @@
 
 	float i;
 	CSQC_CheckEngine();
-	dprint_load();
 
 	binddb = db_create();
 	tempdb = db_create();

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/client/View.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -348,7 +348,6 @@
 	float f, i, j;
 	vector v;
 
-	dprint_load();
 	WaypointSprite_Load();
 
 	if(spectatee_status)

Modified: trunk/data/qcsrc/client/csqc_builtins.qc
===================================================================
--- trunk/data/qcsrc/client/csqc_builtins.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/client/csqc_builtins.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -20,7 +20,7 @@
 string (string s)							precache_sound = #19;
 string (string s)							precache_model = #20;
 
-//void (string s)								dprint = #25;
+void (string s, ...)						dprint = #25;
 string (float f)							ftos = #26;
 string (vector v)							vtos = #27;
 void ()									coredump = #28;

Modified: trunk/data/qcsrc/common/util.qh
===================================================================
--- trunk/data/qcsrc/common/util.qh	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/common/util.qh	2009-12-29 06:37:57 UTC (rev 8462)
@@ -1,14 +1,3 @@
-// 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
 string wordwrap(string s, float l);

Modified: trunk/data/qcsrc/menu/mbuiltin.qh
===================================================================
--- trunk/data/qcsrc/menu/mbuiltin.qh	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/menu/mbuiltin.qh	2009-12-29 06:37:57 UTC (rev 8462)
@@ -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: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/menu/menu.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -22,7 +22,6 @@
 {
 	cvar_set("_menu_alpha", "0");
 
-	dprint_load();
 	check_unacceptable_compiler_bugs();
 
 	// list all game dirs (TEST)
@@ -96,8 +95,6 @@
 	float fh, glob, n, i;
 	string s;
 
-	dprint_load();
-
 	conwidth = conheight = -1;
 	UpdateConWidthHeight();
 	draw_reset_cropped();
@@ -587,7 +584,6 @@
 	if(cvar("cl_capturevideo"))
 		frametime = t / cvar("cl_capturevideo_fps"); // make capturevideo work smoothly
 
-	dprint_load();
 	gamestatus = 0;
 	if(isserver())
 		gamestatus = gamestatus | GAME_ISSERVER;

Modified: trunk/data/qcsrc/server/builtins.qh
===================================================================
--- trunk/data/qcsrc/server/builtins.qh	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/server/builtins.qh	2009-12-29 06:37:57 UTC (rev 8462)
@@ -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; // aliased in util.qh
+void	dprint (string s, ...)								= #25;
 string	ftos (float f)									= #26;
 string	vtos (vector v)									= #27;
 void	coredump (void)									= #28;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/server/g_world.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -394,7 +394,6 @@
 	cvar = cvar_normal;
 	cvar_string = cvar_string_normal;
 	cvar_set = cvar_set_normal;
-	dprint_load(); // load dprint status from cvar
 
 	remove = remove_unsafely;
 
@@ -427,7 +426,6 @@
 	cvar = cvar_normal;
 	cvar_string = cvar_string_normal;
 	cvar_set = cvar_set_normal;
-	dprint_load(); // load dprint status from cvar
 
 	if(world_already_spawned)
 		error("world already spawned - you may have EXACTLY ONE worldspawn!");

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2009-12-26 20:38:56 UTC (rev 8461)
+++ trunk/data/qcsrc/server/sv_main.qc	2009-12-29 06:37:57 UTC (rev 8462)
@@ -166,8 +166,6 @@
 	}
 #endif
 
-	dprint_load(); // load dprint status from cvar
-
 	entity e;
 	for(e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
 		CSQCProjectile_Check(e);



More information about the nexuiz-commits mailing list