fractalnoise enhancements, better smoke textures, better bubble explosions, blood...

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index b04c1a3085ce0ac6522e29ce257557e1e6ab467b..a66e329a15aa17dff155f923845a9a024c728913 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -64,7 +64,7 @@ int                   num_sfx;
 
 sfx_t          *ambient_sfx[NUM_AMBIENTS];
 
-int            desired_speed = 11025;
+int            desired_speed = 44100; //11025; // LordHavoc: 44.1khz sound
 int            desired_bits = 16;
 
 int sound_started=0;
@@ -74,7 +74,7 @@ cvar_t volume = {"volume", "0.7", true};
 
 cvar_t nosound = {"nosound", "0"};
 cvar_t precache = {"precache", "1"};
-cvar_t loadas8bit = {"loadas8bit", "0"};
+//cvar_t loadas8bit = {"loadas8bit", "0"};
 cvar_t bgmbuffer = {"bgmbuffer", "4096"};
 cvar_t ambient_level = {"ambient_level", "0.3"};
 cvar_t ambient_fade = {"ambient_fade", "100"};
@@ -189,7 +189,7 @@ void S_Init (void)
        Cvar_RegisterVariable(&nosound);
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&precache);
-       Cvar_RegisterVariable(&loadas8bit);
+//     Cvar_RegisterVariable(&loadas8bit);
        Cvar_RegisterVariable(&bgmvolume);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
@@ -199,11 +199,13 @@ void S_Init (void)
        Cvar_RegisterVariable(&_snd_mixahead);
        Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring
 
+       /*
        if (host_parms.memsize < 0x800000)
        {
                Cvar_Set ("loadas8bit", "1");
                Con_Printf ("loading all sounds as 8bit\n");
        }
+       */
 
 
 
@@ -233,6 +235,9 @@ void S_Init (void)
                shm->buffer = Hunk_AllocName(1<<16, "shmbuf");
        }
 
+       if (!sound_started)
+               return;
+
        Con_Printf ("Sound sampling rate: %i\n", shm->speed);
 
        // provides a tick sound until washed clean
@@ -286,10 +291,10 @@ sfx_t *S_FindName (char *name)
        sfx_t   *sfx;
 
        if (!name)
-               Sys_Error ("S_FindName: NULL\n");
+               Host_Error ("S_FindName: NULL\n");
 
        if (strlen(name) >= MAX_QPATH)
-               Sys_Error ("Sound name too long: %s", name);
+               Host_Error ("Sound name too long: %s", name);
 
 // see if already loaded
        for (i=0 ; i < num_sfx ; i++)