From f8916ab31db0cd28093db9e9d5fb6abaa5778938 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 28 Aug 2002 07:04:52 +0000 Subject: [PATCH] Do away with LPCTSTR. (We're not making a Unicode build, and if we were it's not being used everywhere it would need to be. If we want Unicode support, that's probably not the way to do it anyway ...) --- stepmania/src/RageException.cpp | 4 ++-- stepmania/src/RageException.h | 4 ++-- stepmania/src/RageSound.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/RageException.cpp b/stepmania/src/RageException.cpp index 1b3bb307f4..dd5f4e2e12 100644 --- a/stepmania/src/RageException.cpp +++ b/stepmania/src/RageException.cpp @@ -17,7 +17,7 @@ #pragma comment(lib, "DxErr8.lib") -RageException::RageException( LPCTSTR fmt, ...) +RageException::RageException( const char *fmt, ...) { va_list va; va_start(va, fmt); @@ -28,7 +28,7 @@ RageException::RageException( LPCTSTR fmt, ...) #endif } -RageException::RageException( HRESULT hr, LPCTSTR fmt, ...) +RageException::RageException( HRESULT hr, const char *fmt, ...) { va_list va; va_start(va, fmt); diff --git a/stepmania/src/RageException.h b/stepmania/src/RageException.h index a130ab51de..e6ac22463d 100644 --- a/stepmania/src/RageException.h +++ b/stepmania/src/RageException.h @@ -15,8 +15,8 @@ class RageException : exception { public: - RageException( LPCTSTR fmt, ...); - RageException( HRESULT hr, LPCTSTR fmt, ...); + RageException( const char *fmt, ...); + RageException( HRESULT hr, const char *fmt, ...); virtual const char *what() const; diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 47afc51944..2da24acb2d 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -83,7 +83,7 @@ RageSound::~RageSound() void RageSound::PlayOnceStreamed( CString sPath ) { - HSTREAM hStream = BASS_StreamCreateFile( FALSE, (void*)((LPCTSTR)sPath), 0, 0, BASS_STREAM_AUTOFREE ); + HSTREAM hStream = BASS_StreamCreateFile( FALSE, const_cast((const char *)sPath), 0, 0, BASS_STREAM_AUTOFREE ); if( hStream == NULL ) throw RageException( "RageSound: Error creating stream." );