diff --git a/stepmania/src/MsdFile.cpp b/stepmania/src/MsdFile.cpp index 6b709699d7..3daec18071 100644 --- a/stepmania/src/MsdFile.cpp +++ b/stepmania/src/MsdFile.cpp @@ -57,7 +57,7 @@ void MsdFile::AddParam( char *buf, int len ) int paramno = m_iNumParams[valueno]; ASSERT( paramno < MAX_PARAMS_PER_VALUE ); m_iNumParams[valueno]++; - m_sParams[valueno][paramno].assign(buf, len); + m_sParams[valueno][paramno] = CString(buf, len); } void MsdFile::AddValue() /* (no extra charge) */ diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 067bcf65a5..57e2574f6b 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -922,7 +922,6 @@ void MusicWheel::Update( float fDeltaTime ) else { m_WheelState = STATE_SELECTING_MUSIC; - } break; case STATE_TWEENING_OFF_SCREEN: diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 0e84f5d961..66e35f2749 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -571,9 +571,9 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData int iIndexCommentStart = sSMNoteData.Find("//"); int iIndexCommentEnd = sSMNoteData.Find("\n", iIndexCommentStart); if( iIndexCommentEnd == -1 ) // comment doesn't have an end? - sSMNoteData.Delete( iIndexCommentStart, 2 ); + sSMNoteData.erase( iIndexCommentStart, 2 ); else - sSMNoteData.Delete( iIndexCommentStart, iIndexCommentEnd-iIndexCommentStart ); + sSMNoteData.erase( iIndexCommentStart, iIndexCommentEnd-iIndexCommentStart ); } CStringArray asMeasures; diff --git a/stepmania/src/NotesLoader.cpp b/stepmania/src/NotesLoader.cpp index 2ce5e5f0fc..75efd9865d 100644 --- a/stepmania/src/NotesLoader.cpp +++ b/stepmania/src/NotesLoader.cpp @@ -20,7 +20,7 @@ void NotesLoader::GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CS if( iBeginIndex == -1 ) continue; sMainTitleOut = sFullTitle.Left( iBeginIndex ); - sSubTitleOut = sFullTitle.Mid( iBeginIndex+1, sFullTitle.GetLength()-iBeginIndex+1 ); + sSubTitleOut = sFullTitle.substr( iBeginIndex+1, sFullTitle.GetLength()-iBeginIndex+1 ); return; } sMainTitleOut = sFullTitle; diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index 344c190f23..66d58c7af6 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -90,9 +90,9 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) if( iIndexOfSeparator != 10000 ) { - value_name = line.Mid( 0, iIndexOfSeparator ); + value_name = line.substr( 0, iIndexOfSeparator ); value_data = line; // the rest - value_data.Delete(0,iIndexOfSeparator+1); + value_data.erase(0,iIndexOfSeparator+1); } else // no separator { @@ -132,7 +132,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) iPosCloseBracket = value_data.Find( ")" ); if( iPosOpenBracket != -1 && iPosCloseBracket != -1 ) - value_data = value_data.Mid( iPosOpenBracket+1, iPosCloseBracket-iPosOpenBracket-1 ); + value_data = value_data.substr( iPosOpenBracket+1, iPosCloseBracket-iPosOpenBracket-1 ); LOG->Trace( "Notes description found to be '%s'", value_data.GetString() ); out.SetDescription(value_data); @@ -145,19 +145,19 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) { out.SetMeter(atoi(value_data)); } - else if( value_name.Left(1) == "#" - && IsAnInt( value_name.Mid(1,3) ) - && IsAnInt( value_name.Mid(4,2) ) ) // this is step or offset data. Looks like "#00705" + else if( value_name.size() >= 6 && value_name[0] == '#' + && IsAnInt( value_name.substr(1,3) ) + && IsAnInt( value_name.substr(4,2) ) ) // this is step or offset data. Looks like "#00705" { - int iMeasureNo = atoi( value_name.Mid(1,3) ); - int iTrackNum = atoi( value_name.Mid(4,2) ); + int iMeasureNo = atoi( value_name.substr(1,3).c_str() ); + int iTrackNum = atoi( value_name.substr(4,2).c_str() ); CString &sNoteData = value_data; CArray arrayNotes; - for( int i=0; i' - int iIndex = value_data.ReverseFind('<'); - if( iIndex == -1 ) - iIndex = value_data.ReverseFind('('); - if( iIndex != -1 ) + unsigned iIndex = value_data.find_last_of('<'); + if( iIndex == value_data.npos ) + iIndex = value_data.find_last_of('('); + if( iIndex != value_data.npos ) { value_data = value_data.Left( iIndex ); GetMainAndSubTitlesFromFullTitle( value_data, out.m_sMainTitle, out.m_sSubTitle ); @@ -344,19 +344,19 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out ) { out.m_sMusicFile = value_data; } - else if( value_name.Left(1) == "#" - && IsAnInt( value_name.Mid(1,3) ) - && IsAnInt( value_name.Mid(4,2) ) ) // this is step or offset data. Looks like "#00705" + else if( value_name.size() >= 6 && value_name[0] == '#' + && IsAnInt( value_name.substr(1,3) ) + && IsAnInt( value_name.substr(4,2) ) ) // this is step or offset data. Looks like "#00705" { - int iMeasureNo = atoi( value_name.Mid(1,3) ); - int iBMSTrackNo = atoi( value_name.Mid(4,2) ); + int iMeasureNo = atoi( value_name.substr(1,3).c_str() ); + int iBMSTrackNo = atoi( value_name.substr(4,2).c_str() ); CString sNoteData = value_data; CArray arrayNotes; - for( int i=0; i 1.0 */ - s.Delete(s.GetLength()-1, 1); // delete last char + s.erase(s.GetLength()-1); // delete last char if( s[s.GetLength()-1] == '0' ) { /* -> 1 */ - s.Delete(s.GetLength()-2, 2); // delete last 2 chars + s.erase(s.GetLength()-2); // delete last 2 chars } } sReturn += s + "X, "; @@ -122,7 +122,7 @@ CString PlayerOptions::GetString() sReturn += "Dark, "; if( sReturn.GetLength() > 2 ) - sReturn.Delete( sReturn.GetLength()-2, 2 ); // delete the trailing ", " + sReturn.erase( sReturn.GetLength()-2 ); // delete the trailing ", " return sReturn; } diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp index 209a6263ce..a754fff99d 100644 --- a/stepmania/src/RageTextureManager.cpp +++ b/stepmania/src/RageTextureManager.cpp @@ -20,6 +20,7 @@ #include "RageUtil.h" #include "RageLog.h" #include "RageException.h" +#include "time.h" RageTextureManager* TEXTUREMAN = NULL; diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index c7a96f49ab..4ab44b3740 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -801,7 +801,7 @@ int CompareSongPointersByTitle(const Song *pSong1, const Song *pSong2) /* The titles are the same. Ensure we get a consistent ordering * by comparing the unique SongFilePaths. */ - return pSong1->GetSongFilePath().CompareNoCase(pSong2->GetSongFilePath()); + return pSong1->GetSongFilePath().CompareNoCase(pSong2->GetSongFilePath()) < 0; } void SortSongPointerArrayByTitle( CArray &arraySongPointers ) diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp index 8f40ea1d5c..cedd14ff8b 100644 --- a/stepmania/src/SongOptions.cpp +++ b/stepmania/src/SongOptions.cpp @@ -45,7 +45,7 @@ CString SongOptions::GetString() { CString s = ssprintf( "%2.2f", m_fMusicRate ); if( s[s.GetLength()-1] == '0' ) - s.Delete(s.GetLength()-1); + s.erase(s.GetLength()-1); sReturn += s + "xMusic, "; } @@ -56,7 +56,7 @@ CString SongOptions::GetString() } if( sReturn.GetLength() > 2 ) - sReturn.Delete( sReturn.GetLength()-2, 2 ); // delete the trailing ", " + sReturn.erase( sReturn.GetLength()-2 ); // delete the trailing ", " return sReturn; } diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 1e214e3e8f..adc50762b5 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -53,7 +53,7 @@ void ThemeManager::GetAllThemeNames( CStringArray& AddTo ) // strip out the folder called "CVS" for( CStringArray::iterator i=AddTo.begin(); i != AddTo.end(); ++i ) { - if( !stricmp(*i,"cvs") ) { + if( !i->CompareNoCase("cvs") ) { AddTo.erase(i, i+1); break; } @@ -84,7 +84,7 @@ bool ThemeManager::DoesThemeExist( CString sThemeName ) GetAllThemeNames( asThemeNames ); for( unsigned i=0; i