fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't crash using -soundspeed

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1226 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-08-12 17:57:22 +00:00
parent c34e488867
commit 0511e3bcbf
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
engine/client/snd_dma.c
View file

@ -505,27 +505,9 @@ void S_Init (void)
} }
Con_DPrintf("\nSound Initialization\n"); Con_DPrintf("\nSound Initialization\n");
if (COM_CheckParm("-nosound"))
{
Cvar_Register(&nosound, "Sound controls");
Cvar_ForceSet(&nosound, "1");
nosound.flags |= CVAR_NOSET;
return;
}
// if (COM_CheckParm("-simsound")) // if (COM_CheckParm("-simsound"))
// fakedma = true; // fakedma = true;
p = COM_CheckParm ("-soundspeed");
if (p)
{
if (p < com_argc-1)
Cvar_SetValue(&snd_khz, atof(com_argv[p+1])/1000);
else
Sys_Error ("S_Init: you must specify a speed in KB after -soundspeed");
}
Cmd_AddCommand("play", S_Play); Cmd_AddCommand("play", S_Play);
Cmd_AddCommand("play2", S_Play); Cmd_AddCommand("play2", S_Play);
Cmd_AddCommand("playvol", S_PlayVol); Cmd_AddCommand("playvol", S_PlayVol);
@ -560,6 +542,21 @@ void S_Init (void)
Cvar_Register(&snd_playersoundvolume, "Sound controls"); Cvar_Register(&snd_playersoundvolume, "Sound controls");
Cvar_Register(&snd_usemultipledevices, "Sound controls"); Cvar_Register(&snd_usemultipledevices, "Sound controls");
if (COM_CheckParm("-nosound"))
{
Cvar_ForceSet(&nosound, "1");
nosound.flags |= CVAR_NOSET;
return;
}
p = COM_CheckParm ("-soundspeed");
if (p)
{
if (p < com_argc-1)
Cvar_SetValue(&snd_khz, atof(com_argv[p+1])/1000);
else
Sys_Error ("S_Init: you must specify a speed in KB after -soundspeed");
}
if (COM_CheckParm ("-nomultipledevices") || COM_CheckParm ("-singlesound")) if (COM_CheckParm ("-nomultipledevices") || COM_CheckParm ("-singlesound"))
Cvar_SetValue(&snd_usemultipledevices, 0); Cvar_SetValue(&snd_usemultipledevices, 0);
@ -574,8 +571,6 @@ void S_Init (void)
Con_Printf ("loading all sounds as 8bit\n"); Con_Printf ("loading all sounds as 8bit\n");
} }
snd_initialized = true; snd_initialized = true;
SND_InitScaletable (); SND_InitScaletable ();