shithub: choc

Info  •  Files  •  Log  •  Branches

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

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

--- a/src/heretic/d_main.c

+++ b/src/heretic/d_main.c

@@ -665,7 +665,7 @@

     _settextposition(25, 1);

     drawstatus();

 #else

-    puts(msg);

+    printf("%s", msg);

 #endif

 }

@@ -865,6 +865,8 @@

     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();

@@ -941,6 +943,11 @@

     tprintf("I_Init: Setting up machine state.\n", 1);

     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);

--- a/src/heretic/i_ibm.c

+++ b/src/heretic/i_ibm.c

@@ -1234,10 +1234,6 @@

 //      I_StartupJoystick();

 //      tprintf("I_StartupKeyboard ",1);

 //      I_StartupKeyboard();

-    tprintf("S_Init... ", 1);

-    S_Init();

-    //IO_StartupTimer();

-    S_Start();

 }