Merge pull request #1431 from blackwc/sfxCompareProvider-fix

Seems to work fine.

Templates/Empty/game/core/scripts/client/audio.cs

@@ -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;
    }

Templates/Full/game/core/scripts/client/audio.cs

@@ -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;
    }