rnd-19981204-2

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 321875dc2aba3f1a5b042f160a56aee319b2fddf..bc72b99a2787ca8f660bfafabbb38ca8baf9b712 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -172,8 +172,9 @@ void InitSound()
   for(i=0; i<NUM_SOUNDS; i++)
   {
 #ifdef MSDOS
   for(i=0; i<NUM_SOUNDS; i++)
   {
 #ifdef MSDOS

-  sprintf(sound_name[i], "%d", i+1);
+    sprintf(sound_name[i], "%d", i + 1);

 #endif
 #endif

+

     Sound[i].name = sound_name[i];
     if (!LoadSound(&Sound[i]))
     {
     Sound[i].name = sound_name[i];
     if (!LoadSound(&Sound[i]))
     {


@@ -188,10 +189,7 @@ void InitSoundServer()
   if (sound_status == SOUND_OFF)
     return;
 
   if (sound_status == SOUND_OFF)
     return;
 

-#ifdef MSDOS
-  SoundServer();
-  return;
-#endif
+#ifndef MSDOS

 
   if (pipe(sound_pipe)<0)
   {
 
   if (pipe(sound_pipe)<0)
   {


@@ -216,6 +214,12 @@ void InitSoundServer()
   }
   else                         /* we are parent */
     close(sound_pipe[0]);      /* no reading from pipe needed */
   }
   else                         /* we are parent */
     close(sound_pipe[0]);      /* no reading from pipe needed */

+
+#else /* MSDOS */
+
+  SoundServer();
+
+#endif /* MSDOS */

 }
 
 void InitJoysticks()
 }
 
 void InitJoysticks()