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

stl-ize some stuff

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-03 05:29:45 +00:00
parent 71d48b3d62
commit f4dbed8221
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MsdFile.cpp
+1 -1
View File
@@ -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) */
stepmania/src/MusicWheel.cpp
-1
View File
@@ -922,7 +922,6 @@ void MusicWheel::Update( float fDeltaTime )
else
{
m_WheelState = STATE_SELECTING_MUSIC;
}
break;
case STATE_TWEENING_OFF_SCREEN:
stepmania/src/NoteData.cpp
+2 -2
View File
@@ -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;
stepmania/src/NotesLoader.cpp
+1 -1
View File
@@ -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;
stepmania/src/NotesLoaderBMS.cpp
+27 -27
View File
@@ -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<bool, bool&> arrayNotes;
for( int i=0; i<sNoteData.GetLength(); i+=2 )
for( int i=0; i+1<sNoteData.GetLength(); i+=2 )
{
bool bThisIsANote = sNoteData.Mid(i,2) != "00";
bool bThisIsANote = sNoteData.substr(i,2) != "00";
arrayNotes.push_back( bThisIsANote );
}
@@ -297,9 +297,9 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &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
{
@@ -314,10 +314,10 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
if( value_name == "#title" )
{
// strip Notes type out of description leaving only song title - looks like 'B4U <BASIC>'
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<int, int> arrayNotes;
for( int i=0; i<sNoteData.GetLength(); i+=2 )
for( int i=0; i+1<sNoteData.GetLength(); i+=2 )
{
CString sNote = sNoteData.Mid(i,2);
CString sNote = sNoteData.substr(i,2);
int iNote;
sscanf( sNote, "%x", &iNote ); // data is in hexadecimal
arrayNotes.push_back( iNote );
@@ -434,9 +434,9 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &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
{
@@ -495,9 +495,9 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &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
{
stepmania/src/PlayerOptions.cpp
+3 -3
View File
@@ -60,10 +60,10 @@ CString PlayerOptions::GetString()
CString s = ssprintf( "%2.2f", m_fArrowScrollSpeed );
if( s[s.GetLength()-1] == '0' ) {
/* -> 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;
}
stepmania/src/RageTextureManager.cpp
+1
View File
@@ -20,6 +20,7 @@
#include "RageUtil.h"
#include "RageLog.h"
#include "RageException.h"
#include "time.h"
RageTextureManager* TEXTUREMAN = NULL;
stepmania/src/Song.cpp
+1 -1
View File
@@ -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<Song*, Song*> &arraySongPointers )
stepmania/src/SongOptions.cpp
+2 -2
View File
@@ -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;
}
stepmania/src/ThemeManager.cpp
+2 -2
View File
@@ -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<asThemeNames.size(); i++ )
{
if( 0==stricmp(sThemeName, asThemeNames[i]) )
if( !sThemeName.CompareNoCase(asThemeNames[i]) )
return true;
}
return false;
stepmania/src/song.h
+3 -3
View File
@@ -102,12 +102,12 @@ public:
CString GetFullTitle() const { return m_sMainTitle + (m_sSubTitle.GetLength()? (" " + m_sSubTitle):""); }
CString GetSortTitle() const { return
(m_sMainTitleTranslit.IsEmpty()?
(m_sMainTitleTranslit.empty()?
m_sMainTitle:
m_sMainTitleTranslit)
+
(m_sSubTitleTranslit.IsEmpty()?
(m_sSubTitle.IsEmpty()?
(m_sSubTitleTranslit.empty()?
(m_sSubTitle.empty()?
"":
" " + m_sSubTitle):
" " + m_sSubTitleTranslit);