mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-23 04:11:53 +00:00
don't crash using -soundspeed
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1226 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
c34e488867
commit
0511e3bcbf
1 changed files with 15 additions and 20 deletions
|
@ -505,27 +505,9 @@ void S_Init (void)
|
|||
}
|
||||
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"))
|
||||
// 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("play2", S_Play);
|
||||
Cmd_AddCommand("playvol", S_PlayVol);
|
||||
|
@ -560,6 +542,21 @@ void S_Init (void)
|
|||
Cvar_Register(&snd_playersoundvolume, "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"))
|
||||
Cvar_SetValue(&snd_usemultipledevices, 0);
|
||||
|
@ -574,8 +571,6 @@ void S_Init (void)
|
|||
Con_Printf ("loading all sounds as 8bit\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
snd_initialized = true;
|
||||
|
||||
SND_InitScaletable ();
|
||||
|
|
Loading…
Reference in a new issue