zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-03 02:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into powerslave

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-13 20:43:23 +01:00
commit 052ed5fff7
338 changed files with 20918 additions and 39961 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/audiolib/src/fx_man.cpp
View file

@ -62,8 +62,6 @@ int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata)
SoundCard = ASS_SDL;
#elif defined RENDERTYPEWIN
SoundCard = ASS_DirectSound;
#else
SoundCard = ASS_NoSound;
#endif
}
@ -76,8 +74,8 @@ int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata)
if (SoundDriver_IsPCMSupported(SoundCard) == 0)
{
// unsupported cards fall back to no sound
MV_Printf("Couldn't init %s, falling back to no sound...\n", SoundDriver_GetName(SoundCard));
SoundCard = ASS_NoSound;
FX_SetErrorCode(FX_InvalidCard);
return FX_Error;
}
int status = FX_Ok;