From 30146936183970fccad40661db70598b39b42e9a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 29 Jul 2003 23:20:33 +0000
Subject: [PATCH] fix blacklist image filenames being case-sensitive

---
 stepmania/src/NotesLoader.h      | 5 +++--
 stepmania/src/NotesLoaderDWI.cpp | 2 +-
 stepmania/src/Song.cpp           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h
index d07be126af..4f1e60f3fb 100644
--- a/stepmania/src/NotesLoader.h
+++ b/stepmania/src/NotesLoader.h
@@ -2,6 +2,7 @@
 #define NOTES_LOADER_H
 
 #include "song.h"
+#include "RageUtil.h"
 #include <set>
 
 typedef int DanceNote;
@@ -25,11 +26,11 @@ class NotesLoader {
 protected:
 	virtual void GetApplicableFiles( CString sPath, CStringArray &out )=0;
 
-	set<CString> BlacklistedImages;
+	set<istring> BlacklistedImages;
 
 public:
 	virtual ~NotesLoader() { }
-	const set<CString> &GetBlacklistedImages() const { return BlacklistedImages; }
+	const set<istring> &GetBlacklistedImages() const { return BlacklistedImages; }
 	static void GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut );
 	virtual bool LoadFromDir( CString sPath, Song &out ) = 0;
 	bool Loadable( CString sPath );
diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index cc89bb25ce..2671ae5a71 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -484,7 +484,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
 
 				pos = endpos + 1;
 
-				BlacklistedImages.insert( sub );
+				BlacklistedImages.insert( sub.c_str() );
 			}
 		}
 		else
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 5af0b4d7e3..c66c15b6ba 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -336,7 +336,7 @@ NotesLoader *Song::MakeLoader( CString sDir ) const
 
 /* Hack: This should be a parameter to TidyUpData, but I don't want to
  * pull in <set> into Song.h, which is heavily used. */
-static set<CString> BlacklistedImages;
+static set<istring> BlacklistedImages;
 
 bool Song::LoadWithoutCache( CString sDir )
 {
@@ -686,7 +686,7 @@ void Song::TidyUpData()
 	for( i=0; i<arrayImages.size(); i++ )	// foreach image
 	{
 		// ignore DWI "-char" graphics
-		if( BlacklistedImages.find( arrayImages[i] ) != BlacklistedImages.end() )
+		if( BlacklistedImages.find( arrayImages[i].c_str() ) != BlacklistedImages.end() )
 			continue;	// skip
 		
 		// Skip any image that we've already classified