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

conflicting name

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-06 22:48:46 +00:00
parent 0306efd64b
commit c11c9fb909
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEnding.cpp
+2 -2
View File
@@ -30,7 +30,7 @@
#define TEXT_ZOOM THEME->GetMetricF("ScreenEnding","TextZoom") #define TEXT_ZOOM THEME->GetMetricF("ScreenEnding","TextZoom")
CString STATS_LINE_TITLE[NUM_STATS_LINES] = { CString STATS_LINE_TITLE[NUM_ENDING_STATS_LINES] = {
"Total Calories", "Total Calories",
"Total Songs Played", "Total Songs Played",
"Current Combo", "Current Combo",
@@ -82,7 +82,7 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa
if( pProfile == NULL ) if( pProfile == NULL )
continue; // don't show the stats lines continue; // don't show the stats lines
for( int i=0; i<NUM_STATS_LINES; i++ ) for( int i=0; i<NUM_ENDING_STATS_LINES; i++ )
{ {
m_textStatsTitle[p][i].LoadFromFont( THEME->GetPathToF("ScreenEnding stats title") ); m_textStatsTitle[p][i].LoadFromFont( THEME->GetPathToF("ScreenEnding stats title") );
m_textStatsTitle[p][i].SetText( STATS_LINE_TITLE[i] ); m_textStatsTitle[p][i].SetText( STATS_LINE_TITLE[i] );
stepmania/src/ScreenEnding.h
+3 -3
View File
@@ -24,9 +24,9 @@ public:
private: private:
BitmapText m_textPlayerName[NUM_PLAYERS]; BitmapText m_textPlayerName[NUM_PLAYERS];
#define NUM_STATS_LINES 3 // Total calories burned, total songs played, current combo #define NUM_ENDING_STATS_LINES 3 // Total calories burned, total songs played, current combo
BitmapText m_textStatsTitle[NUM_PLAYERS][NUM_STATS_LINES]; BitmapText m_textStatsTitle[NUM_PLAYERS][NUM_ENDING_STATS_LINES];
BitmapText m_textStatsValue[NUM_PLAYERS][NUM_STATS_LINES]; BitmapText m_textStatsValue[NUM_PLAYERS][NUM_ENDING_STATS_LINES];
Sprite m_sprRemoveMemoryCard[NUM_PLAYERS]; Sprite m_sprRemoveMemoryCard[NUM_PLAYERS];
bool m_bWaitingForRemoveCard[NUM_PLAYERS]; bool m_bWaitingForRemoveCard[NUM_PLAYERS];