From b442e26fb0673f483b61ec295eed426435e6b7f1 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 10 Jul 2008 04:37:41 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@850
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/build/src/cache1d.c               |  2 +-
 polymer/build/src/mmulti.c                |  1 +
 polymer/build/src/winlayer.c              | 14 +++++++-------
 polymer/eduke32/source/game.c             |  4 ++--
 polymer/eduke32/source/gamedef.c          |  8 ++++----
 polymer/eduke32/source/jaudiolib/openal.c |  1 +
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/polymer/build/src/cache1d.c b/polymer/build/src/cache1d.c
index fe45f5ca3..9ddeebe38 100644
--- a/polymer/build/src/cache1d.c
+++ b/polymer/build/src/cache1d.c
@@ -104,7 +104,7 @@ void initcache(intptr_t dacachestart, int dacachesize)
     cac[0].lock = &zerochar;
     cacnum = 1;
 
-    initprintf("Initialized %.1f megabytes of cache\n", (float)(dacachesize/1024.f/1024.f));
+    initprintf("Initialized %.1f megabyte cache\n", (float)(dacachesize/1024.f/1024.f));
 }
 
 void allocache(intptr_t *newhandle, int newbytes, char *newlockptr)
diff --git a/polymer/build/src/mmulti.c b/polymer/build/src/mmulti.c
index e9d66a0f7..0cacd1323 100644
--- a/polymer/build/src/mmulti.c
+++ b/polymer/build/src/mmulti.c
@@ -411,6 +411,7 @@ int initmultiplayersparms(int argc, char **argv)
     initmultiplayers_reset();
     danetmode = 255; daindex = 0;
 
+    if (!argv) return 0;
     // go looking for the port, if specified
     for (i=0;i<argc;i++)
     {
diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c
index 19c7cc7fe..049f583f5 100644
--- a/polymer/build/src/winlayer.c
+++ b/polymer/build/src/winlayer.c
@@ -510,10 +510,10 @@ static void print_os_version(void)
 
     if (ver != NULL)
     {
-        initprintf("OS: Windows %s (Version %lu.%lu.%lu)\n", ver, osv.dwMajorVersion, osv.dwMinorVersion,
-                   awful_windows_9x?osv.dwBuildNumber&0xffff:osv.dwBuildNumber);
-        if (osv.szCSDVersion[0])
-            initprintf("  - %s\n", osv.szCSDVersion);
+        initprintf("OS: Windows %s (%lu.%lu.%lu) %s\n", ver, osv.dwMajorVersion, osv.dwMinorVersion,
+                   awful_windows_9x?osv.dwBuildNumber&0xffff:osv.dwBuildNumber,osv.szCSDVersion);
+//        if (osv.szCSDVersion[0])
+  //          initprintf("  - %s\n", osv.szCSDVersion);
     }
 }
 
@@ -833,7 +833,7 @@ int initmouse(void)
 
     if (moustat) return 0;
 
-    initprintf("Initializing mouse... ");
+//    initprintf("Initializing mouse... ");
 
     moustat=1;
     mousethread = CreateThread
@@ -848,13 +848,13 @@ int initmouse(void)
 
     if (!mousethread)
     {
-        initprintf("FAILED!\n");
+        initprintf("Failed to create mouse thread!\n");
         return 0;
     }
 
     SetThreadPriority(mousethread, THREAD_PRIORITY_HIGHEST);
     ResumeThread(mousethread);
-    initprintf("OK\n");
+//    initprintf("OK\n");
 
     // grab input
     grabmouse(1);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 91ac26b93..104f97375 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -10404,10 +10404,10 @@ void app_main(int argc,const char **argv)
     if (VOLUMEALL) wm_setapptitle(HEAD2);
     else wm_setapptitle(HEAD);
 
-    initprintf("\n");
+//    initprintf("\n");
 
     if (g_ScriptDebug)
-        initprintf("CON debugging activated (level %d).\n\n",g_ScriptDebug);
+        initprintf("CON debugging activated (level %d).\n",g_ScriptDebug);
 
     RegisterShutdownFunction(Shutdown);
 
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index f3825fa49..61ef89b8e 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -4732,13 +4732,13 @@ repeatcase:
 
             if (keyword() != -1)
             {
-                initprintf("Duke Nukem 3D v1.3D style CON files detected.\n");
+//                initprintf("Duke Nukem 3D v1.3D style CON files detected.\n");
                 break;
             }
             else
             {
                 g_ScriptVersion = 14;
-                initprintf("Duke Nukem 3D v1.4+ style CON files detected.\n");
+//                initprintf("Duke Nukem 3D v1.4+ style CON files detected.\n");
             }
 
         }
@@ -5194,9 +5194,9 @@ void loadefs(const char *filenam)
                 k++;
         }
 
-        initprintf("\nCompiled code size: %ld bytes\n",(unsigned)(scriptptr-script));
+        initprintf("Compiled code size: %ld bytes, version %s\n",(unsigned)(scriptptr-script),(g_ScriptVersion == 14?"1.4+":"1.3D"));
         initprintf("%ld/%ld labels, %d/%d variables\n",labelcnt,min((MAXSECTORS * sizeof(sectortype)/sizeof(int)),(MAXSPRITES * sizeof(spritetype)/(1<<6))),iGameVarCount,MAXGAMEVARS);
-        initprintf("%ld event definitions, %ld defined actors\n\n",j,k);
+        initprintf("%ld event definitions, %ld defined actors\n",j,k);
 
         for (i=0;i<128;i++)
             if (fta_quotes[i] == NULL)
diff --git a/polymer/eduke32/source/jaudiolib/openal.c b/polymer/eduke32/source/jaudiolib/openal.c
index 9c41bfb2f..9dfd13bd2 100644
--- a/polymer/eduke32/source/jaudiolib/openal.c
+++ b/polymer/eduke32/source/jaudiolib/openal.c
@@ -349,6 +349,7 @@ void AL_Shutdown()
 {
     if (openal_disabled)return;
 
+    initprintf("Uninitializing OpenAL...\n");
     ALdoing="Shut";
     balcMakeContextCurrent(NULL);
     check(1);