Changed vec4_t down to vec3_t, got the server browser integrated with the menu.dat. csqc is having fun, and nexuiz should work better. Enjoy.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1011 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
a366a4d90a
commit
e348dc30a2
44 changed files with 2031 additions and 1159 deletions
|
@ -513,9 +513,11 @@ sndinitstat SNDDMA_InitDirect (soundcardinfo_t *sc)
|
|||
dsnd_guids=0;
|
||||
dsndguid=NULL;
|
||||
dsndcard="DirectSound";
|
||||
if (snd_multipledevices)
|
||||
if (pDirectSoundEnumerate)
|
||||
pDirectSoundEnumerate(&DSEnumCallback, NULL);
|
||||
if (!snd_multipledevices)
|
||||
dsndguid=NULL;
|
||||
|
||||
aimedforguid++;
|
||||
|
||||
if (!dsndguid) //no more...
|
||||
|
@ -523,11 +525,15 @@ sndinitstat SNDDMA_InitDirect (soundcardinfo_t *sc)
|
|||
return SIS_NOMORE;
|
||||
//EAX attempt
|
||||
#ifndef MINIMAL
|
||||
CoInitialize(NULL);
|
||||
if (FAILED(CoCreateInstance( &CLSID_EAXDirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void **)&sc->pDS )))
|
||||
sc->pDS=NULL;
|
||||
else
|
||||
IDirectSound_Initialize(sc->pDS, dsndguid);
|
||||
sc->pDS = NULL;
|
||||
if (snd_eax.value)
|
||||
{
|
||||
CoInitialize(NULL);
|
||||
if (FAILED(CoCreateInstance( &CLSID_EAXDirectSound, dsndguid, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void **)&sc->pDS )))
|
||||
sc->pDS=NULL;
|
||||
else
|
||||
IDirectSound_Initialize(sc->pDS, dsndguid);
|
||||
}
|
||||
|
||||
if (!sc->pDS)
|
||||
#endif
|
||||
|
@ -548,7 +554,7 @@ sndinitstat SNDDMA_InitDirect (soundcardinfo_t *sc)
|
|||
// {
|
||||
Con_SafePrintf (": failure\n"
|
||||
" hardware already in use\n"
|
||||
" Close the app then use snd_restart\n");
|
||||
" Close the other app then use snd_restart\n");
|
||||
return SIS_NOTAVAIL;
|
||||
// }
|
||||
}
|
||||
|
@ -1016,7 +1022,7 @@ int SNDDMA_Init(soundcardinfo_t *sc)
|
|||
sc->snd_isdirect = true;
|
||||
|
||||
if (snd_firsttime)
|
||||
Con_SafePrintf ("%s initialized\n", sc->name);
|
||||
Con_DPrintf ("%s initialized\n", sc->name);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -1025,7 +1031,7 @@ int SNDDMA_Init(soundcardinfo_t *sc)
|
|||
else
|
||||
{
|
||||
sc->snd_isdirect = false;
|
||||
Con_SafePrintf ("DirectSound failed to init\n");
|
||||
Con_DPrintf ("DirectSound failed to init\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue