From 39bb3feaddc1adc9b99fe8dd077e2e2e22669092 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 29 Dec 2009 06:37:57 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8462 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/Main.qc | 1 - data/qcsrc/client/View.qc | 1 - data/qcsrc/client/csqc_builtins.qc | 2 +- data/qcsrc/common/util.qh | 11 ----------- data/qcsrc/menu/mbuiltin.qh | 2 +- data/qcsrc/menu/menu.qc | 4 ---- data/qcsrc/server/builtins.qh | 2 +- data/qcsrc/server/g_world.qc | 2 -- data/qcsrc/server/sv_main.qc | 2 -- 9 files changed, 3 insertions(+), 24 deletions(-) diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc index 1e54d09af..d32594029 100644 --- a/data/qcsrc/client/Main.qc +++ b/data/qcsrc/client/Main.qc @@ -61,7 +61,6 @@ void CSQC_Init(void) float i; CSQC_CheckEngine(); - dprint_load(); binddb = db_create(); tempdb = db_create(); diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 7f4c0507c..4d8e83376 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -348,7 +348,6 @@ void CSQC_UpdateView(float w, float h) float f, i, j; vector v; - dprint_load(); WaypointSprite_Load(); if(spectatee_status) diff --git a/data/qcsrc/client/csqc_builtins.qc b/data/qcsrc/client/csqc_builtins.qc index 171353ca2..ba4dd6356 100644 --- a/data/qcsrc/client/csqc_builtins.qc +++ b/data/qcsrc/client/csqc_builtins.qc @@ -20,7 +20,7 @@ entity (entity start, .string fld, string match) find = #18; 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; diff --git a/data/qcsrc/common/util.qh b/data/qcsrc/common/util.qh index e5c620297..d963343d0 100644 --- a/data/qcsrc/common/util.qh +++ b/data/qcsrc/common/util.qh @@ -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); diff --git a/data/qcsrc/menu/mbuiltin.qh b/data/qcsrc/menu/mbuiltin.qh index aff47871f..999bab69a 100644 --- a/data/qcsrc/menu/mbuiltin.qh +++ b/data/qcsrc/menu/mbuiltin.qh @@ -37,7 +37,7 @@ const string cvar_string(string name) = #71; 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 diff --git a/data/qcsrc/menu/menu.qc b/data/qcsrc/menu/menu.qc index aad1bb05a..f3103bb42 100644 --- a/data/qcsrc/menu/menu.qc +++ b/data/qcsrc/menu/menu.qc @@ -22,7 +22,6 @@ void() m_init = { cvar_set("_menu_alpha", "0"); - dprint_load(); check_unacceptable_compiler_bugs(); // list all game dirs (TEST) @@ -96,8 +95,6 @@ void() m_init_delayed = float fh, glob, n, i; string s; - dprint_load(); - conwidth = conheight = -1; UpdateConWidthHeight(); draw_reset_cropped(); @@ -587,7 +584,6 @@ void() m_draw = if(cvar("cl_capturevideo")) frametime = t / cvar("cl_capturevideo_fps"); // make capturevideo work smoothly - dprint_load(); gamestatus = 0; if(isserver()) gamestatus = gamestatus | GAME_ISSERVER; diff --git a/data/qcsrc/server/builtins.qh b/data/qcsrc/server/builtins.qh index 8abca4ab4..ef54b1d38 100644 --- a/data/qcsrc/server/builtins.qh +++ b/data/qcsrc/server/builtins.qh @@ -23,7 +23,7 @@ void(entity client, string s) stuffcmd = #21; 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; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index f6fa61fe8..9b0d9a2e8 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -394,7 +394,6 @@ void spawnfunc___init_dedicated_server(void) 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 @@ void spawnfunc_worldspawn (void) 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!"); diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc index 4d3136121..e6569ebae 100644 --- a/data/qcsrc/server/sv_main.qc +++ b/data/qcsrc/server/sv_main.qc @@ -166,8 +166,6 @@ void StartFrame (void) } #endif - dprint_load(); // load dprint status from cvar - entity e; for(e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); ) CSQCProjectile_Check(e); -- 2.39.2