Merge branch 'rarified/vs2010_default'

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp

@@ -72,8 +72,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAudioSystem.h"
 #include <al.h>
 
-#include <dmusici.h>
+#include <dxerr.h>
-#include <dxerr9.h>
 #ifdef EAX_SDK_AVAILABLE
 #include <eax.h>
 #include <eax-util.h>

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <stdio.h>
 #include "plWavFile.h"
 
-#include <dxerr9.h>
+#include <dxerr.h>
 #include <dsound.h>
 
 #include <stdio.h>

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

@@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <d3d9.h>
 #include <ddraw.h>
 #include <d3dx9mesh.h>
-#include <dxerr9.h>
+#include <dxerr.h>
 
 #include "hsWinRef.h"
 
@@ -11837,7 +11837,7 @@ void	plDXPipeline::ISetErrorMessage( char *errStr )
 // Convert the last D3D error code to a string (probably "Conflicting Render State").
 void	plDXPipeline::IGetD3DError()
 {
-	sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString9( fSettings.fDXError ) );
+	sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString( fSettings.fDXError ) );
 }
 
 // IShowErrorMessage /////////////////////////////////////////////////////////////