Increase console verbosity so it feels like the engine is actually doing things

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12859 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_main.c b/cl_main.c
index 31ad52bc7b5c7333a03e7ca189cb0d9750603dcc..517d388311553caf5d2533a23b878cc821e2eed3 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -2915,7 +2915,7 @@ void CL_Init (void)
        }
        else
        {
-               Con_DPrintf("Initializing client\n");
+               Con_Printf("Initializing client\n");
 
                R_Modules_Init();
                Palette_Init();

diff --git a/cl_parse.c b/cl_parse.c
index 02f876386018e5768cb1f9932c6cdd556474f0bc..a7e658809579ac797a8666fbf38ebe248d551bec 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1715,7 +1715,7 @@ static void CL_ParseServerInfo (void)
        if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && gamemode == GAME_NEHAHRA)
                protocol = PROTOCOL_NEHAHRAMOVIE;
        cls.protocol = protocol;
-       Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol));
+       Con_Printf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol));
 
        cl.num_entities = 1;
 

diff --git a/console.c b/console.c
index 37d342b0667e071eaca35e8f672c7a3dc1982aec..7a523605bbf63aa063cf83975e40501681d0a2b6 100644 (file)
--- a/console.c
+++ b/console.c
@@ -933,7 +933,7 @@ void Con_Init (void)
        // initialize console window (only used by sys_win.c)
        Sys_InitConsole();
        
-       Con_DPrint("Console initialized.\n");
+       Con_Print("Console initialized.\n");
 }
 
 void Con_Shutdown (void)

diff --git a/csprogs.c b/csprogs.c
index ca9348c5c6bf64940297d31aaaaa72bfceb575bb..700796a7f6f02e4c7052eee7ac00e2bd312a71ec 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -1088,8 +1088,6 @@ void CL_VM_Init (void)
                return;
        }
 
-       Con_DPrintf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
-
        if(cls.demorecording)
        {
                if(cls.demo_lastcsprogssize != csprogsdatasize || cls.demo_lastcsprogscrc != csprogsdatacrc)

diff --git a/gl_backend.c b/gl_backend.c
index 5f53208d59908d86f88832c1ed30acf34e39c02d..c8ef04a1ad1ce326eff2cc5469217d0469052ad7 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -258,7 +258,7 @@ static void gl_backend_start(void)
 
        Mem_ExpandableArray_NewArray(&gl_state.meshbufferarray, r_main_mempool, sizeof(r_meshbuffer_t), 128);
 
-       Con_DPrintf("OpenGL backend started.\n");
+       Con_Printf("OpenGL backend started\n");
 
        CHECKGLERROR
 
@@ -281,7 +281,7 @@ static void gl_backend_start(void)
 
 static void gl_backend_shutdown(void)
 {
-       Con_DPrint("OpenGL Backend shutting down\n");
+       Con_Print("OpenGL backend shutting down\n");
 
        switch(vid.renderpath)
        {

diff --git a/gl_draw.c b/gl_draw.c
index fd4eef5d74953df1388f2181c71829b929b7213e..37c8911d9c035f374afc8331fc30204f0cb656fe 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -365,7 +365,7 @@ void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale,
        if(fnt->req_face != -1)
        {
                if(!Font_LoadFont(fnt->texpath, fnt))
-                       Con_DPrintf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
+                       Con_Printf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
        }
 
        fnt->pic = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0) | CACHEPICFLAG_FAILONMISSING);

diff --git a/model_brush.c b/model_brush.c
index d24c6878587d90aa89322e183d21979ba4744c60..25328e23bddb957e9d6018b37b8d03a0447786cc 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -5585,12 +5585,12 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
        {
                // no internal lightmaps
                // try external lightmaps
-               if (developer_loading.integer)
-                       Con_Printf("Using external lightmaps\n");
                FS_StripExtension(loadmodel->name, mapname, sizeof(mapname));
                inpixels[0] = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "%s/lm_%04d", mapname, 0), false, false, false, NULL);
                if(!inpixels[0])
                        return;
+               else
+                       Con_Printf("Using external lightmaps\n");
 
                // using EXTERNAL lightmaps instead
                if(image_width != (int) CeilPowerOf2(image_width) || image_width != image_height)
@@ -5686,7 +5686,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
                }
        }
 
-       Con_DPrintf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not ");
+       Con_Printf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not ");
 
        // figure out what the most reasonable merge power is within limits
 

diff --git a/prvm_edict.c b/prvm_edict.c
index 8bcd48c9cdf19bb94abf60f007c93a91b48c572d..ed6a22003de81fc305deb71ed5c72e68c161ec1e 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -2012,8 +2012,6 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
        prog->profiletime = Sys_DirtyTime();
        prog->starttime = host.realtime;
 
-       Con_DPrintf("%s programs occupy %iK.\n", prog->name, (int)(filesize/1024));
-
        requiredglobalspace = 0;
        for (i = 0;i < numrequiredglobals;i++)
                requiredglobalspace += required_global[i].type == ev_vector ? 3 : 1;
@@ -2538,6 +2536,8 @@ fail:
        // init mempools
        PRVM_MEM_Alloc(prog);
 
+       Con_Printf("Progs \"%s\" loaded (crc %i, size %iK)\n", prog->name, prog->progs_crc, (int)(filesize/1024));
+
        // Inittime is at least the time when this function finished. However,
        // later events may bump it.
        prog->inittime = host.realtime;

diff --git a/snd_mem.c b/snd_mem.c
index 482b7709493552d0e6c1f0fdeff86a17479df878..09bdb8eea668d43ec40c6240e2371bfe406a0bed 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -160,7 +160,7 @@ qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
        // Can't load the sound!
        sfx->flags |= SFXFLAG_FILEMISSING;
        if (complain)
-               Con_DPrintf("failed to load sound \"%s\"\n", sfx->name);
+               Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name);
 
        SCR_PopLoadingScreen(false);
        return false;

diff --git a/sv_main.c b/sv_main.c
index 1144daf6fafb3bd61e0f480eca75d8ae6c20ed21..c7beec92b271ece2846153c3faba9c8415fbe187 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -3415,7 +3415,7 @@ void SV_SpawnServer (const char *map)
        char modelname[sizeof(sv.worldname)];
        char vabuf[1024];
 
-       Con_DPrintf("SpawnServer: %s\n", map);
+       Con_Printf("SpawnServer: %s\n", map);
 
        dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", map);
 
@@ -3702,7 +3702,7 @@ void SV_SpawnServer (const char *map)
        strlcpy(sv.worldmessage, PRVM_GetString(prog, PRVM_serveredictstring(prog->edicts, message)), sizeof(sv.worldmessage)); // map title (not related to filename)
        Cvar_SetQuick(&sv_worldmessage, sv.worldmessage);
 
-       Con_DPrint("Server spawned.\n");
+       Con_Printf("Server spawned.\n");
        NetConn_Heartbeat (2);
 
        if(cls.state == ca_dedicated)

diff --git a/vid_shared.c b/vid_shared.c
index 98287ece6352a41b323dee007fef2b8eb82aeece..a031fd35e7cc4c380617f0d5cd7e7cfd01e337d3 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -687,6 +687,8 @@ void VID_ClearExtensions(void)
 void GL_Setup(void)
 {
        char *s;
+       int j;
+       GLint numextensions = 0;
        const glfunction_t *func;
        qboolean missingrequiredfuncs = false;
        static char missingfuncs[16384];
@@ -705,19 +707,16 @@ void GL_Setup(void)
        Con_Printf("GL_RENDERER: %s\n", gl_renderer);
        Con_Printf("GL_VERSION: %s\n", gl_version);
 
-       if (developer.integer)
+       qglGetIntegerv(GL_NUM_EXTENSIONS, &numextensions);
+       Con_DPrint("GL_EXTENSIONS:\n");
+       for (j = 0; j < numextensions; j++)
        {
-               int j;
-               GLint numextensions = 0;
-               qglGetIntegerv(GL_NUM_EXTENSIONS, &numextensions);
-               Con_DPrint("GL_EXTENSIONS:");
-               for (j = 0; j < numextensions; j++)
-               {
-                       const char *ext = (const char *)qglGetStringi(GL_EXTENSIONS, j);
-                       Con_DPrintf(" %s", ext);
-               }
-               Con_DPrint("\n");
+               const char *ext = (const char *)qglGetStringi(GL_EXTENSIONS, j);
+               Con_DPrintf(" %s", ext);
+               if(j && !(j % 3))
+                       Con_DPrintf("\n");
        }
+       Con_DPrint("\n");
 
 #ifndef USE_GLES2
        missingfuncs[0] = 0;
@@ -745,7 +744,7 @@ void GL_Setup(void)
                vid.support.glshaderversion = (int)(atof(s) * 100.0f + 0.5f);
        if (vid.support.glshaderversion < 100)
                vid.support.glshaderversion = 100;
-       Con_DPrintf("Detected GLSL #version %i\n", vid.support.glshaderversion);
+       Con_Printf("Detected GLSL version %i\n", vid.support.glshaderversion);
 
 #ifdef USE_GLES2
        // GLES devices in general do not like GL_BGRA, so use GL_RGBA
@@ -800,12 +799,12 @@ void GL_Setup(void)
        CHECKGLERROR
 
 #ifdef USE_GLES2
-       Con_DPrint("Using GLES2 rendering path\n");
+       Con_Print("Using GLES2 rendering path\n");
        vid.renderpath = RENDERPATH_GLES2;
        vid.sRGBcapable2D = false;
        vid.sRGBcapable3D = false;
 #else
-       Con_DPrint("Using GL32 rendering path\n");
+       Con_Print("Using GL32 rendering path\n");
        vid.renderpath = RENDERPATH_GL32;
        vid.sRGBcapable2D = false;
        vid.sRGBcapable3D = true;