Move sound startup code to d_main.c. Add call to D_SetConfigDir.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1278

2 files changed, 8 insertions, 5 deletions

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 7ccb6826..cf844e70 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -665,7 +665,7 @@ void tprintf(char *msg, int initflag)
     _settextposition(25, 1);
     drawstatus();
 #else
-    puts(msg);
+    printf("%s", msg);
 #endif
 }
 
@@ -865,6 +865,8 @@ void D_DoomMain(void)
     printf("V_Init: allocate screens.\n");
     V_Init();
 
+    M_SetConfigDir();
+
     // Load defaults before initing other systems
     printf("M_LoadDefaults: Load system defaults.\n");
     M_LoadDefaults();
@@ -942,6 +944,11 @@ void D_DoomMain(void)
     I_Init();
     IncThermo();
 
+    tprintf("S_Init... ", 1);
+    S_Init();
+    //IO_StartupTimer();
+    S_Start();
+
     tprintf("D_CheckNetGame: Checking network game status.\n", 1);
     hgotoxy(17, 9);
     hprintf("Checking network game status.", 0x3f);
diff --git a/src/heretic/i_ibm.c b/src/heretic/i_ibm.c
index fba6b599..b93b9fa0 100644
--- a/src/heretic/i_ibm.c
+++ b/src/heretic/i_ibm.c
@@ -1234,10 +1234,6 @@ void I_Init(void)
 //      I_StartupJoystick();
 //      tprintf("I_StartupKeyboard ",1);
 //      I_StartupKeyboard();
-    tprintf("S_Init... ", 1);
-    S_Init();
-    //IO_StartupTimer();
-    S_Start();
 }