From f5afebcef735508a40a20fb2a5a1b81e2ac8af8f Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 27 Dec 2009 12:02:58 +0000 Subject: [PATCH] changed several Con_Printf calls to Con_DPrintf added q3bsp stats printing (like q1bsp stats) and added mesh info git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9705 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_shared.c | 4 ++-- cl_parse.c | 4 ++-- csprogs.c | 4 ++-- fs.c | 4 ++-- gl_draw.c | 2 +- menu.c | 2 +- model_brush.c | 4 +++- model_shared.c | 4 ++-- netconn.c | 2 +- snd_main.c | 2 +- sv_main.c | 2 +- 11 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cd_shared.c b/cd_shared.c index e86653fd..33a5dcc6 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -129,7 +129,7 @@ qboolean CDAudio_Play_real (int track, qboolean looping, qboolean complain) if (track > maxTrack) { if(complain) - Con_Printf("CDAudio: Bad track number %u.\n", track); + Con_DPrintf("CDAudio: Bad track number %u.\n", track); return false; } @@ -192,7 +192,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping) track = (unsigned char) atoi(trackname); if (track < 1) { - Con_Printf("CDAudio: Bad track number %u.\n", track); + Con_DPrintf("CDAudio: Bad track number %u.\n", track); return; } } diff --git a/cl_parse.c b/cl_parse.c index 72b1cbf8..81e08aae 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -1668,7 +1668,7 @@ void CL_ParseServerInfo (void) cl.movevars_airaccel_sideways_friction = 0; // seperate the printfs so the server message can have a color - Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); + Con_Printf("\n\n<===================================>\n\n\2%s\n", str); // check memory integrity Mem_CheckSentinelsGlobal(); @@ -1713,7 +1713,7 @@ void CL_ParseServerInfo (void) // seperate the printfs so the server message can have a color if (cls.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie - Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); + Con_Printf("\n<===================================>\n\n\2%s\n", str); // check memory integrity Mem_CheckSentinelsGlobal(); diff --git a/csprogs.c b/csprogs.c index 0492d10c..42ee1555 100644 --- a/csprogs.c +++ b/csprogs.c @@ -939,7 +939,7 @@ void CL_VM_Init (void) return; } - Con_Printf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize); + Con_DPrintf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize); if(cls.demorecording) { @@ -1010,7 +1010,7 @@ void CL_VM_ShutDown (void) PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing"); PRVM_ResetProg(); CSQC_END - Con_Print("CSQC ^1unloaded\n"); + Con_DPrint("CSQC ^1unloaded\n"); cl.csqc_loaded = false; } diff --git a/fs.c b/fs.c index d05da064..7a145187 100644 --- a/fs.c +++ b/fs.c @@ -718,7 +718,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile) return NULL; } - Con_Printf("Added packfile %s (%i files)\n", packfile, real_nb_files); + Con_DPrintf("Added packfile %s (%i files)\n", packfile, real_nb_files); return pack; } @@ -947,7 +947,7 @@ pack_t *FS_LoadPackPAK (const char *packfile) Mem_Free(info); - Con_Printf("Added packfile %s (%i files)\n", packfile, numpackfiles); + Con_DPrintf("Added packfile %s (%i files)\n", packfile, numpackfiles); return pack; } diff --git a/gl_draw.c b/gl_draw.c index dd13d5e6..67e17f63 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -289,7 +289,7 @@ static rtexture_t *draw_generatepic(const char *name, qboolean quiet) if (!strcmp(name, "gfx/colorcontrol/ditherpattern")) return draw_generateditherpattern(); if (!quiet) - Con_Printf("Draw_CachePic: failed to load %s\n", name); + Con_DPrintf("Draw_CachePic: failed to load %s\n", name); return r_texture_notexture; } diff --git a/menu.c b/menu.c index 06252650..263e06bd 100644 --- a/menu.c +++ b/menu.c @@ -111,7 +111,7 @@ void M_Update_Return_Reason(char *s) { strlcpy(m_return_reason, s, sizeof(m_return_reason)); if (s) - Con_Printf("%s\n", s); + Con_DPrintf("%s\n", s); } #define StartingGame (m_multiplayer_cursor == 1) diff --git a/model_brush.c b/model_brush.c index c488b32e..b1642548 100644 --- a/model_brush.c +++ b/model_brush.c @@ -3725,7 +3725,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) //Mod_Q1BSP_ProcessLightList(); - Con_DPrintf("Some stats for q1bsp model \"%s\": %i faces, %i nodes, %i leafs, %i visleafs, %i visleafportals\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals); + Con_DPrintf("Stats for q1bsp model \"%s\": %i faces, %i nodes, %i leafs, %i visleafs, %i visleafportals, mesh: %i vertices, %i triangles, %i surfaces\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->num_surfaces); } static void Mod_Q2BSP_LoadEntities(lump_t *l) @@ -6280,6 +6280,8 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) if (j < mod->nummodelsurfaces) mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes; } + + Con_DPrintf("Stats for q3bsp model \"%s\": %i faces, %i nodes, %i leafs, %i clusters, %i clusterportals, mesh: %i vertices, %i triangles, %i surfaces\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->num_surfaces); } void Mod_IBSP_Load(dp_model_t *mod, void *buffer, void *bufferend) diff --git a/model_shared.c b/model_shared.c index 8aec8ba8..7f7dba0f 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1482,7 +1482,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader) end = ((unsigned char *) (&shader->Q3SHADERINFO_COMPARE_END)) + sizeof(shader->Q3SHADERINFO_COMPARE_END); start2 = (unsigned char *) (&entry->shader.Q3SHADERINFO_COMPARE_START); if(memcmp(start, start2, end - start)) - Con_Printf("Shader '%s' already defined, ignoring mismatching redeclaration\n", shader->name); + Con_DPrintf("Shader '%s' already defined, ignoring mismatching redeclaration\n", shader->name); else Con_DPrintf("Shader '%s' already defined\n", shader->name); return; @@ -1556,7 +1556,7 @@ void Mod_LoadQ3Shaders(void) strlcpy(shader.name, com_token, sizeof(shader.name)); if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{")) { - Con_Printf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[fileindex], com_token); + Con_DPrintf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[fileindex], com_token); break; } while (COM_ParseToken_QuakeC(&text, false)) diff --git a/netconn.c b/netconn.c index f36dec1f..595a6714 100755 --- a/netconn.c +++ b/netconn.c @@ -1636,7 +1636,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // darkplaces or quake3 char protocolnames[1400]; Protocol_Names(protocolnames, sizeof(protocolnames)); - Con_Printf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); + Con_DPrintf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); M_Update_Return_Reason("Got challenge response"); // update the server IP in the userinfo (QW servers expect this, and it is used by the reconnect command) InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ip", addressstring2); diff --git a/snd_main.c b/snd_main.c index 40a8c187..d627dc51 100644 --- a/snd_main.c +++ b/snd_main.c @@ -1428,7 +1428,7 @@ void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags, // If it's a static sound if (isstatic) { - if (sfx->loopstart >= sfx->total_length) + if (sfx->loopstart >= sfx->total_length && (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEWORLD)) Con_DPrintf("Quake compatibility warning: Static sound \"%s\" is not looped\n", sfx->name); target_chan->dist_mult = attenuation / (64.0f * snd_soundradius.value); } diff --git a/sv_main.c b/sv_main.c index 21d55904..6def900a 100644 --- a/sv_main.c +++ b/sv_main.c @@ -823,7 +823,7 @@ void SV_SendServerinfo (client_t *client) SZ_Clear (&client->netconnection->message); MSG_WriteByte (&client->netconnection->message, svc_print); - dpsnprintf (message, sizeof (message), "\nServer: %s build %s (progs %i crc)", gamename, buildstring, prog->filecrc); + dpsnprintf (message, sizeof (message), "\nServer: %s build %s (progs %i crc)\n", gamename, buildstring, prog->filecrc); MSG_WriteString (&client->netconnection->message,message); SV_StopDemoRecording(client); // to split up demos into different files -- 2.39.2