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

option icons working, new font format, more theme metrics cleanup

Browse Source
This commit is contained in:
Chris Danford
2002-09-03 22:31:06 +00:00
parent 106531a0f8
commit 7ab487072f
48 changed files with 350 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+4 -14
View File
@@ -29,22 +29,14 @@ const CString g_sStatisticsFileName = "statistics.ini";
#define GROUP_COLOR( i ) THEME->GetMetricC("SongManager",ssprintf("GroupColor%d",i+1))
#define EXTRA_COLOR THEME->GetMetricC("SongManager","ExtraColor")
const int NUM_GROUP_COLORS = 7;
D3DXCOLOR GROUP_COLORS[NUM_GROUP_COLORS];
D3DXCOLOR g_GroupColors[30];
D3DXCOLOR g_ExtraColor;
SongManager::SongManager( void(*callback)() )
{
// Loading these theme metrics is slow, so only do it ever 20th time.
GROUP_COLORS[0] = GROUP_COLOR_1;
GROUP_COLORS[1] = GROUP_COLOR_2;
GROUP_COLORS[2] = GROUP_COLOR_3;
GROUP_COLORS[3] = GROUP_COLOR_4;
GROUP_COLORS[4] = GROUP_COLOR_5;
GROUP_COLORS[5] = GROUP_COLOR_6;
GROUP_COLORS[6] = GROUP_COLOR_7;
for( int i=0; i<NUM_GROUP_COLORS; i++ )
g_GroupColors[i] = GROUP_COLOR( i );
g_ExtraColor = EXTRA_COLOR;
InitSongArrayFromDisk( callback );
@@ -55,8 +47,6 @@ SongManager::SongManager( void(*callback)() )
SongManager::~SongManager()
{
// BUG FIX: Stats will no longer save if you're in autoplay mode - Andy.
// BUG BUG FIX: if user used autoplay, the evaluation screen already detects this...
SaveStatisticsToDisk();
FreeSongArray();
}
@@ -368,7 +358,7 @@ D3DXCOLOR SongManager::GetGroupColor( const CString &sGroupName )
}
ASSERT( i != m_arrayGroupNames.GetSize() ); // this is not a valid group
return GROUP_COLORS[i%NUM_GROUP_COLORS];
return g_GroupColors[i%NUM_GROUP_COLORS];
}
D3DXCOLOR SongManager::GetSongColor( Song* pSong )