From bde39eee6442e697fdc37bd7ee1334551c86af8c Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 28 Sep 2008 15:53:52 +0000
Subject: Tidy up heretic start up messages.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1301
---
 src/Makefile.am      |  1 -
 src/doomfeatures.h   |  2 +-
 src/heretic/d_main.c |  5 +++--
 src/heretic/r_data.c | 12 ++++++------
 src/heretic/r_main.c | 24 ++++++++++++------------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 820c9d64..c931d27f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,7 +99,6 @@ mus2mid.c            mus2mid.h
 
 SOURCE_FILES = $(MAIN_SOURCE_FILES)                \
                $(FEATURE_DEHACKED_SOURCE_FILES)    \
-               $(FEATURE_MULTIPLAYER_SOURCE_FILES) \
                $(FEATURE_WAD_MERGE_SOURCE_FILES)   \
                $(FEATURE_SOUND_SOURCE_FILES)
 
diff --git a/src/doomfeatures.h b/src/doomfeatures.h
index 46e26e52..c5e6067a 100644
--- a/src/doomfeatures.h
+++ b/src/doomfeatures.h
@@ -37,7 +37,7 @@
 
 // Enables multiplayer support (network games)
 
-#define FEATURE_MULTIPLAYER 1
+//#define FEATURE_MULTIPLAYER 1
 
 // Enables sound output
 
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 8c7a14d0..19944c21 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -990,8 +990,9 @@ void D_DoomMain(void)
     hgotoxy(17, 7);
     hprintf("Loading graphics", 0x3f);
     R_Init();
+    tprintf("\n", 0);
 
-    tprintf("P_Init: Init Playloop state.", 1);
+    tprintf("P_Init: Init Playloop state.\n", 1);
     hgotoxy(17, 8);
     hprintf("Init game engine.", 0x3f);
     P_Init();
@@ -1001,7 +1002,7 @@ void D_DoomMain(void)
     I_Init();
     IncThermo();
 
-    tprintf("S_Init... ", 1);
+    tprintf("S_Init: Setting up sound.\n", 1);
     S_Init();
     //IO_StartupTimer();
     S_Start();
diff --git a/src/heretic/r_data.c b/src/heretic/r_data.c
index 6e65abdd..153f2a70 100644
--- a/src/heretic/r_data.c
+++ b/src/heretic/r_data.c
@@ -540,17 +540,17 @@ void R_InitColormaps(void)
 
 void R_InitData(void)
 {
-    tprintf("\nR_InitTextures ", 0);
+    //tprintf("\nR_InitTextures ", 0);
     R_InitTextures();
-//printf (".");
-    tprintf("R_InitFlats\n", 0);
+    printf (".");
+    //tprintf("R_InitFlats\n", 0);
     R_InitFlats();
     IncThermo();
-//printf (".");
-    tprintf("R_InitSpriteLumps ", 0);
+    printf (".");
+    //tprintf("R_InitSpriteLumps ", 0);
     R_InitSpriteLumps();
     IncThermo();
-//printf (".");
+    printf (".");
     R_InitColormaps();
 }
 
diff --git a/src/heretic/r_main.c b/src/heretic/r_main.c
index 975dce0c..e75d35bb 100644
--- a/src/heretic/r_main.c
+++ b/src/heretic/r_main.c
@@ -666,26 +666,26 @@ int screenblocks = 10;
 
 void R_Init(void)
 {
-    tprintf("R_InitData ", 1);
+    //tprintf("R_InitData ", 1);
     R_InitData();
-//printf (".");
-    tprintf("R_InitPointToAngle\n", 0);
+    printf (".");
+    //tprintf("R_InitPointToAngle\n", 0);
     R_InitPointToAngle();
-//printf (".");
-    tprintf("R_InitTables ", 0);
+    printf (".");
+    //tprintf("R_InitTables ", 0);
     R_InitTables();
     // viewwidth / viewheight / detailLevel are set by the defaults
-//printf (".");
+    printf (".");
     R_SetViewSize(screenblocks, detailLevel);
-    tprintf("R_InitPlanes\n", 0);
+    //tprintf("R_InitPlanes\n", 0);
     R_InitPlanes();
-//printf (".");
-    tprintf("R_InitLightTables ", 0);
+    printf (".");
+    //tprintf("R_InitLightTables ", 0);
     R_InitLightTables();
-//printf (".");
-    tprintf("R_InitSkyMap\n", 0);
+    printf (".");
+    //tprintf("R_InitSkyMap\n", 0);
     R_InitSkyMap();
-//printf (".");
+    printf (".");
     R_InitTranslationTables();
     framecount = 0;
 }
-- 
cgit v1.2.3