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

themable "N/A", "Other"

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-30 20:58:42 +00:00
parent dd16deaf23
commit 3c11c86ea9
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongUtil.cpp
+11 -7
View File
@@ -11,7 +11,10 @@
#include "XmlFile.h" #include "XmlFile.h"
#include "Foreach.h" #include "Foreach.h"
#include "UnlockManager.h" #include "UnlockManager.h"
#include "ThemeMetric.h"
static ThemeMetric<CString> SORT_NOT_AVAILABLE( "Sort", "NotAvailable" );
static ThemeMetric<CString> SORT_OTHER ( "Sort", "Other" );
///////////////////////////////////// /////////////////////////////////////
// Sorting // Sorting
@@ -242,14 +245,14 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
else if( s[0] >= '0' && s[0] <= '9' ) else if( s[0] >= '0' && s[0] <= '9' )
return "0-9"; return "0-9";
else if( s[0] < 'A' || s[0] > 'Z') else if( s[0] < 'A' || s[0] > 'Z')
return "OTHER"; return SORT_OTHER.GetValue();
else else
return s.Left(1); return s.Left(1);
} }
case SORT_GENRE: case SORT_GENRE:
if( !pSong->m_sGenre.empty() ) if( !pSong->m_sGenre.empty() )
return pSong->m_sGenre; return pSong->m_sGenre;
return "N/A"; return SORT_NOT_AVAILABLE.GetValue();
case SORT_BPM: case SORT_BPM:
{ {
const int iBPMGroupSize = 20; const int iBPMGroupSize = 20;
@@ -279,28 +282,28 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_EASY); Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_EASY);
if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) ) if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) )
return ssprintf("%02d", pSteps->GetMeter() ); return ssprintf("%02d", pSteps->GetMeter() );
return "N/A"; return SORT_NOT_AVAILABLE.GetValue();
} }
case SORT_MEDIUM_METER: case SORT_MEDIUM_METER:
{ {
Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_MEDIUM); Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_MEDIUM);
if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) ) if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) )
return ssprintf("%02d", pSteps->GetMeter() ); return ssprintf("%02d", pSteps->GetMeter() );
return "N/A"; return SORT_NOT_AVAILABLE.GetValue();
} }
case SORT_HARD_METER: case SORT_HARD_METER:
{ {
Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_HARD); Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_HARD);
if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) ) if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) )
return ssprintf("%02d", pSteps->GetMeter() ); return ssprintf("%02d", pSteps->GetMeter() );
return "N/A"; return SORT_NOT_AVAILABLE.GetValue();
} }
case SORT_CHALLENGE_METER: case SORT_CHALLENGE_METER:
{ {
Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_CHALLENGE); Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_CHALLENGE);
if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) ) if( pSteps && !UNLOCKMAN->StepsIsLocked(pSong,pSteps) )
return ssprintf("%02d", pSteps->GetMeter() ); return ssprintf("%02d", pSteps->GetMeter() );
return "N/A"; return SORT_NOT_AVAILABLE.GetValue();
} }
case SORT_MODE_MENU: case SORT_MODE_MENU:
return CString(); return CString();
@@ -316,13 +319,14 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
void SongUtil::SortSongPointerArrayBySectionName( vector<Song*> &vpSongsInOut, SortOrder so ) void SongUtil::SortSongPointerArrayBySectionName( vector<Song*> &vpSongsInOut, SortOrder so )
{ {
CString sOther = SORT_OTHER.GetValue();
for(unsigned i = 0; i < vpSongsInOut.size(); ++i) for(unsigned i = 0; i < vpSongsInOut.size(); ++i)
{ {
CString val = GetSectionNameFromSongAndSort( vpSongsInOut[i], so ); CString val = GetSectionNameFromSongAndSort( vpSongsInOut[i], so );
/* Make sure 0-9 comes first and OTHER comes last. */ /* Make sure 0-9 comes first and OTHER comes last. */
if( val == "0-9" ) val = "0"; if( val == "0-9" ) val = "0";
else if( val == "OTHER" ) val = "2"; else if( val == sOther ) val = "2";
else val = "1" + MakeSortString(val); else val = "1" + MakeSortString(val);
g_mapSongSortVal[vpSongsInOut[i]] = val; g_mapSongSortVal[vpSongsInOut[i]] = val;