X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_dma.c;h=a66e329a15aa17dff155f923845a9a024c728913;hp=7c28e3a1cf5a4791044cd8f2f20a589bd0f7ef81;hb=37051d673a36462927804663cd7fbe60d862d09c;hpb=cecffffdd5310e387e8b910735ff77aa329cdb43

diff --git a/snd_dma.c b/snd_dma.c
index 7c28e3a1..a66e329a 100644
--- 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");
 	}
+	*/