From 26560983d2b8f7cc8d9534bd35889bc1a6a5b0b7 Mon Sep 17 00:00:00 2001
From: rarified <FoundryMaster@OpenUru.org>
Date: Tue, 3 Nov 2020 15:45:09 -0700
Subject: [PATCH] Code changes to build with VS2010 without patching.

This commit will follow the tag VS2003_FINAL which is the last commit
that will compile under VS2003 without changes.

This incorporates all source code changes known to be necessary to build
CWE with VS2010.
---
 .../Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp        | 3 +--
 .../Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp  | 2 +-
 .../Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
index f9f260dd..806241db 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
+++ b/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 <dxerr9.h>
+#include <dxerr.h>
 #ifdef EAX_SDK_AVAILABLE
 #include <eax.h>
 #include <eax-util.h>
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp
index 3767bcd4..21af473a 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp
+++ b/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>
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
index 0e1fd56c..24495ef4 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
+++ b/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 /////////////////////////////////////////////////////////////