TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1431 from blackwc/sfxCompareProvider-fix

Browse source 
Seems to work fine.
This commit is contained in:
Areloch 2015-10-19 22:20:18 -05:00
parent 0f8d4d30ab 3c252689f3
commit f41f9fb7c8
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Templates/Empty/game/core/scripts/client/audio.cs
View file

@ -239,26 +239,26 @@ function sfxCompareProvider( %providerA, %providerB )
case "FMOD":
return 1;
case "XAudio":
if( %providerB !$= "FMOD" )
return 1;
else
return -1;
// Prefer OpenAL over anything but FMOD.
case "OpenAL":
if( %providerB $= "FMOD" && %providerB !$= "XAudio")
if( %providerB $= "FMOD" )
return -1;
else
return 1;
// DSound is just about deprecated, so make that one the last fallback
case "DirectSound":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" && %providerB !$= "XAudio")
// choose XAudio over DirectSound
case "XAudio":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" )
return -1;
else
return 0;
case "DirectSound":
if( %providerB !$= "FMOD" && %providerB !$= "OpenAL" && %providerB !$= "XAudio" )
return 1;
else
return -1;
default:
return -1;
}

22
Templates/Full/game/core/scripts/client/audio.cs
View file

@ -239,26 +239,26 @@ function sfxCompareProvider( %providerA, %providerB )
case "FMOD":
return 1;
case "XAudio":
if( %providerB !$= "FMOD" )
return 1;
else
return -1;
// Prefer OpenAL over anything but FMOD.
case "OpenAL":
if( %providerB $= "FMOD" && %providerB !$= "XAudio")
if( %providerB $= "FMOD" )
return -1;
else
return 1;
// DSound is just about deprecated, so make that one the last fallback
case "DirectSound":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" && %providerB !$= "XAudio")
// choose XAudio over DirectSound
case "XAudio":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" )
return -1;
else
return 0;
case "DirectSound":
if( %providerB !$= "FMOD" && %providerB !$= "OpenAL" && %providerB !$= "XAudio" )
return 1;
else
return -1;
default:
return -1;
}