Misc console print improvements. Increase verbosity

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

diff --git a/cl_parse.c b/cl_parse.c
index a7e658809579ac797a8666fbf38ebe248d551bec..e35e43c2fffd26c57cc98c0eb9cb795dc1e9b136 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1335,7 +1335,6 @@ static void CL_BeginDownloads(qboolean aborteddownload)
                        dpsnprintf(soundname, sizeof(soundname), "sound/%s", cl.sound_name[cl.downloadsound_current]);
                        if (!FS_FileExists(soundname) && !FS_FileExists(cl.sound_name[cl.downloadsound_current]))
                        {
-                               Con_Printf("Sound %s not found\n", soundname);
                                if (cl_serverextension_download.integer && cls.netcon && !sv.active)
                                {
                                        CL_ForwardToServer(va(vabuf, sizeof(vabuf), "download %s", soundname));

diff --git a/host.c b/host.c
index a455b88a89cb0c7a527c86e8a72719a6c75c9ae7..354291ea12213ca38b8c58bd79f54a869e9ebcc2 100644 (file)
--- a/host.c
+++ b/host.c
@@ -528,8 +528,10 @@ void Host_StartVideo(void)
        if (!vid_opened && cls.state != ca_dedicated)
        {
                vid_opened = true;
+#ifdef WIN32
                // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
                NetConn_UpdateSockets();
+#endif
                VID_Start();
                CDAudio_Startup();
        }

diff --git a/image_png.c b/image_png.c
index 7ef74f9a54a1f1445e65246e9cbb0c4b0d32fbd4..9c712d1556ea3913c87f35e94778e6cad165fab3 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -172,14 +172,16 @@ qboolean PNG_OpenLibrary (void)
                return true;
 
        // Load the DLL
-       if(!Sys_LoadLibrary (dllnames, &png_dll, pngfuncs))
-               return false;
-       if(qpng_access_version_number() / 100 >= 104)
-               if(!Sys_LoadLibrary (dllnames, &png14_dll, png14funcs))
+       if(!Sys_LoadLibrary (dllnames, &png14_dll, pngfuncs))
+       {
+               if(qpng_access_version_number() / 100 >= 104)
+                       return false;
+               if(!Sys_LoadLibrary (dllnames, &png_dll, png14funcs))
                {
-                       Sys_UnloadLibrary (&png_dll);
+                       Sys_UnloadLibrary (&png14_dll);
                        return false;
                }
+       }
        return true;
 }
 

diff --git a/netconn.c b/netconn.c
index aac264d1b401d6f7f41edce0c4e3f4cc3c288d88..4425dfd5002cf74e57bbb3e0ecc52264279626ac 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -1060,7 +1060,6 @@ void NetConn_OpenServerPorts(int opennetports)
        port = bound(0, sv_netport.integer, 65535);
        if (port == 0)
                port = 26000;
-       Con_Printf("Server using port %i\n", port);
        if (sv_netport.integer != port)
                Cvar_SetValueQuick(&sv_netport, port);
        if (cls.state != ca_dedicated)

diff --git a/prvm_edict.c b/prvm_edict.c
index ed6a22003de81fc305deb71ed5c72e68c161ec1e..61649a25f295ead13abe5b1d41343ca7c8394c54 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -2536,7 +2536,7 @@ 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));
+       Con_Printf("%s: program loaded (crc %i, size %iK)\n", prog->name, prog->filecrc, (int)(filesize/1024));
 
        // Inittime is at least the time when this function finished. However,
        // later events may bump it.

diff --git a/sv_main.c b/sv_main.c
index c7beec92b271ece2846153c3faba9c8415fbe187..ca813104197474f9b8701fc1383d970be6f636a2 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -3521,7 +3521,7 @@ void SV_SpawnServer (const char *map)
        if(*sv_random_seed.string)
        {
                srand(sv_random_seed.integer);
-               Con_Printf("NOTE: random seed is %d; use for debugging/benchmarking only!\nUnset sv_random_seed to get real random numbers again.\n", sv_random_seed.integer);
+               Con_Printf(CON_WARN "NOTE: random seed is %d; use for debugging/benchmarking only!\nUnset sv_random_seed to get real random numbers again.\n", sv_random_seed.integer);
        }
 
        SV_VM_Setup();
@@ -3543,7 +3543,7 @@ void SV_SpawnServer (const char *map)
        {
                char buffer[1024];
                Protocol_Names(buffer, sizeof(buffer));
-               Con_Printf("Unknown sv_protocolname \"%s\", valid values are:\n%s\n", sv_protocolname.string, buffer);
+               Con_Printf(CON_ERROR "Unknown sv_protocolname \"%s\", valid values are:\n%s\n", sv_protocolname.string, buffer);
                sv.protocol = PROTOCOL_QUAKE;
        }
 

diff --git a/sys_shared.c b/sys_shared.c
index 4898c82a02a1b0e8ea1315f1853f87b13b94a2dc..0f7e0bdd01f9a6b8d69da8733e60da4b81f9658d 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -202,6 +202,7 @@ notfound:
        }
 
        Con_DPrintf(" - loaded.\n");
+       Con_Printf("Loaded library \"%s\"\n", dllnames[i]);
 
        *handle = dllhandle;
        return true;