only show a few songs each time through ScreenRanking

This commit is contained in:
Chris Danford
2003-10-22 11:28:11 +00:00
parent 7c1712a24a
commit 5635d934aa
2 changed files with 23 additions and 11 deletions
+2 -1
View File
@@ -2489,7 +2489,8 @@ DifficultyOnCommand=addx,640;sleep,0.1;bounceend,1;addx,-640
DifficultyOffCommand=sleep,0.1;linear,0.5;diffusealpha,0
SecondsPerPage=5
ShowCategories=1
ShowAllSongs=1
ShowSongScores=0
NumSongsToShow=10
CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs
NotesTypesToHide=dance-couple,dance-solo,pump-halfdouble
TextColor1=0.6,0.6,1,1
+21 -10
View File
@@ -23,6 +23,8 @@
#include "ScoreKeeperMAX2.h"
#include "ScoreKeeper5th.h"
int g_iLastSongShown = 0;
#define CATEGORY_X THEME->GetMetricF("ScreenRanking","CategoryX")
#define CATEGORY_Y THEME->GetMetricF("ScreenRanking","CategoryY")
@@ -77,7 +79,8 @@
#define SECONDS_PER_PAGE THEME->GetMetricF("ScreenRanking","SecondsPerPage")
#define PAGE_FADE_SECONDS THEME->GetMetricF("ScreenRanking","PageFadeSeconds")
#define SHOW_CATEGORIES THEME->GetMetricB("ScreenRanking","ShowCategories")
#define SHOW_ALL_SONGS THEME->GetMetricB("ScreenRanking","ShowAllSongs")
#define SHOW_SONG_SCORES THEME->GetMetricB("ScreenRanking","ShowSongScores")
#define NUM_SONGS_TO_SHOW THEME->GetMetricI("ScreenRanking","NumSongsToShow")
#define NOTES_TYPES_TO_HIDE THEME->GetMetric ("ScreenRanking","NotesTypesToHide")
#define EMPTY_SCORE_NAME THEME->GetMetric ("ScreenRanking","EmptyScoreName")
#define DIFFICULTIES_TO_SHOW THEME->GetMetric ("ScreenRanking","DifficultiesToShow")
@@ -90,6 +93,8 @@ const ScreenMessage SM_HidePage = (ScreenMessage)(SM_User+68);
ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
{
g_iLastSongShown++;
this->AddChild( &m_sprCategory );
this->AddChild( &m_banner );
@@ -214,19 +219,25 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
}
}
if( SHOW_ALL_SONGS )
if( SHOW_SONG_SCORES )
{
vector<Song*> vpSongs = SONGMAN->GetAllSongs();
for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
if( !vpSongs.empty() )
{
for( unsigned j=0; j<vpSongs.size(); j++ )
for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
{
PageToShow pts;
pts.type = PageToShow::TYPE_SONG;
pts.colorIndex = i;
pts.pSong = vpSongs[j];
pts.nt = aNotesTypesToShow[i];
m_vPagesToShow.push_back( pts );
for( unsigned j=0; j<NUM_SONGS_TO_SHOW; j++ )
{
PageToShow pts;
pts.type = PageToShow::TYPE_SONG;
pts.colorIndex = i;
pts.pSong = vpSongs[g_iLastSongShown];
pts.nt = aNotesTypesToShow[i];
m_vPagesToShow.push_back( pts );
g_iLastSongShown++;
wrap( g_iLastSongShown,vpSongs.size() );
}
}
}
}