actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't use istring here

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-28 23:04:24 +00:00
parent 054cacfc11
commit 70c3facebc
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoader.h
+2 -3
View File
@@ -3,7 +3,6 @@
#ifndef NOTES_LOADER_H #ifndef NOTES_LOADER_H
#define NOTES_LOADER_H #define NOTES_LOADER_H
#include "RageUtil.h"
#include <set> #include <set>
class Song; class Song;
@@ -13,11 +12,11 @@ class NotesLoader
protected: protected:
virtual void GetApplicableFiles( const RString &sPath, vector<RString> &out )=0; virtual void GetApplicableFiles( const RString &sPath, vector<RString> &out )=0;
set<istring> BlacklistedImages; set<RString> BlacklistedImages;
public: public:
virtual ~NotesLoader() { } virtual ~NotesLoader() { }
const set<istring> &GetBlacklistedImages() const { return BlacklistedImages; } const set<RString> &GetBlacklistedImages() const { return BlacklistedImages; }
static void GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut ); static void GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut );
virtual bool LoadFromDir( const RString &sPath, Song &out ) = 0; virtual bool LoadFromDir( const RString &sPath, Song &out ) = 0;
virtual void TidyUpData( Song &song, bool cache ) { } virtual void TidyUpData( Song &song, bool cache ) { }
stepmania/src/NotesLoaderDWI.cpp
+2 -1
View File
@@ -525,7 +525,8 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
pos = endpos + 1; pos = endpos + 1;
BlacklistedImages.insert( sub.c_str() ); sub.ToLower();
BlacklistedImages.insert( sub );
} }
} }
else else
stepmania/src/Song.cpp
+4 -2
View File
@@ -192,7 +192,7 @@ NotesLoader *Song::MakeLoader( RString sDir ) const
/* Hack: This should be a parameter to TidyUpData, but I don't want to /* Hack: This should be a parameter to TidyUpData, but I don't want to
* pull in <set> into Song.h, which is heavily used. */ * pull in <set> into Song.h, which is heavily used. */
static set<istring> BlacklistedImages; static set<RString> BlacklistedImages;
/* /*
* If PREFSMAN->m_bFastLoad is true, always load from cache if possible. Don't read * If PREFSMAN->m_bFastLoad is true, always load from cache if possible. Don't read
@@ -641,7 +641,9 @@ void Song::TidyUpData()
break; /* done */ break; /* done */
// ignore DWI "-char" graphics // ignore DWI "-char" graphics
if( BlacklistedImages.find( arrayImages[i].c_str() ) != BlacklistedImages.end() ) RString sLower = arrayImages[i];
sLower.ToLower();
if( BlacklistedImages.find(sLower) != BlacklistedImages.end() )
continue; // skip continue; // skip
// Skip any image that we've already classified // Skip any image that we've already classified