From 7716edf4aceda109b69f8902a70a39f7bc60123b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 14 Jul 2003 22:23:04 +0000
Subject: [PATCH] Fix error reporting.

---
 stepmania/src/RageUtil.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index d99edcd4cf..715bd9431d 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -132,7 +132,12 @@ CString vssprintf( const char *fmt, va_list argList)
 }
 
 #ifdef WIN32
+#ifdef _XBOX
 #include "D3DX8Core.h"
+#else
+#include "Dxerr8.h"
+#pragma comment(lib, "Dxerr8.lib")
+#endif
 
 CString hr_ssprintf( int hr, const char *fmt, ...)
 {
@@ -141,9 +146,15 @@ CString hr_ssprintf( int hr, const char *fmt, ...)
     CString s = vssprintf( fmt, va );
     va_end(va);
 
+#ifdef _XBOX
+	/* XXX: This doesn't work for DirectInput or DirectSound; why is it needed? 
+	 * XBox uses DI and DS, too, right? -glenn */
 	char szError[1024] = "";
 	D3DXGetErrorString( hr, szError, sizeof(szError) );
-	
+#else	
+	const char *szError = DXGetErrorString8( hr );
+#endif
+
 	return s + ssprintf( " (%s)", szError );
 }