From 0984cfd15d8c9bb86302a28ee3f7024d35f6ed5d Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 9 Dec 2002 03:09:59 +0000
Subject: [PATCH] add hr_ssprintf; remove a bunch of empty comments

---
 stepmania/src/RageUtil.cpp | 33 +++++++++++++--------------------
 stepmania/src/RageUtil.h   |  3 +++
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index dd6e4b89f3..c8955a37f2 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -65,10 +65,6 @@ CString SecondsToTime( float fSecs )
 	return sReturn;
 }
 
-//-----------------------------------------------------------------------------
-// Name: ssprintf()
-// Desc:
-//-----------------------------------------------------------------------------
 CString ssprintf( const char *fmt, ...)
 {
     va_list	va;
@@ -77,10 +73,6 @@ CString ssprintf( const char *fmt, ...)
 }
 
 
-//-----------------------------------------------------------------------------
-// Name: vssprintf()
-// Desc:
-//-----------------------------------------------------------------------------
 CString vssprintf( const char *fmt, va_list argList)
 {
 	CString str;
@@ -88,12 +80,21 @@ CString vssprintf( const char *fmt, va_list argList)
 	return str;
 }
 
+#ifdef WIN32
+#include "dxerr8.h"
+#pragma comment(lib, "DxErr8.lib")
 
+CString hr_ssprintf( int hr, const char *fmt, ...)
+{
+    va_list	va;
+    va_start(va, fmt);
+    CString s = vssprintf( fmt, va );
+    va_end(va);
+
+	return s += ssprintf( "(%s)", DXGetErrorString8(hr) );
+}
+#endif
 
-//-----------------------------------------------------------------------------
-// Name: join()
-// Desc:
-//-----------------------------------------------------------------------------
 CString join( const CString &Deliminator, const CStringArray& Source)
 {
 	if( Source.empty() )
@@ -111,10 +112,6 @@ CString join( const CString &Deliminator, const CStringArray& Source)
 }
 
 
-//-----------------------------------------------------------------------------
-// Name: split()
-// Desc:
-//-----------------------------------------------------------------------------
 void split( const CString &Source, const CString &Deliminator, CStringArray& AddIt, const bool bIgnoreEmpty )
 {
 	int startpos = 0;
@@ -199,10 +196,6 @@ void splitpath( bool UsingDirsOnly, const CString &Path, CString& Drive, CString
 	}
 }
 
-//-----------------------------------------------------------------------------
-// Name: splitpath()
-// Desc:
-//-----------------------------------------------------------------------------
 void splitrelpath( const CString &Path, CString& Dir, CString& FName, CString& Ext )
 {
 	/* Find the last slash or backslash. */
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index 09e0dde9ef..ea1a880abf 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -119,6 +119,9 @@ CString SecondsToTime( float fSecs );
 CString ssprintf( const char *fmt, ...);
 CString vssprintf( const char *fmt, va_list argList );
 
+#ifdef WIN32
+CString hr_ssprintf( int hr, const char *fmt, ...);
+#endif
 
 // Splits a Path into 4 parts (Directory, Drive, Filename, Extention).  Supports UNC path names.
 // param1: Whether the Supplied Path (PARAM2) contains a directory name only