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

add EmptyMachineHighScoreName

Browse Source
This commit is contained in:
Chris Danford
2005-06-12 00:44:59 +00:00
parent 623dc2512f
commit 7374f1566e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+8 -6
View File
@@ -81,7 +81,7 @@ void PaneDisplay::Load( const CString &sType, PlayerNumber pn )
{ {
m_PlayerNumber = pn; m_PlayerNumber = pn;
m_sprPaneUnder.Load( THEME->GetPathG("PaneDisplay",ssprintf("under p%i",pn+1)) ); m_sprPaneUnder.Load( THEME->GetPathG(sType,ssprintf("under p%i",pn+1)) );
m_sprPaneUnder->SetName( "Under" ); m_sprPaneUnder->SetName( "Under" );
ActorUtil::OnCommand( m_sprPaneUnder, sType ); ActorUtil::OnCommand( m_sprPaneUnder, sType );
this->AddChild( m_sprPaneUnder ); this->AddChild( m_sprPaneUnder );
@@ -119,18 +119,20 @@ void PaneDisplay::Load( const CString &sType, PlayerNumber pn )
} }
} }
EMPTY_MACHINE_HIGH_SCORE_NAME.Load( sType, "EmptyMachineHighScoreName" );
for( int p = 0; p < NUM_PANE_CONTENTS; ++p ) for( int p = 0; p < NUM_PANE_CONTENTS; ++p )
{ {
if( g_Contents[p].type == NUM_PANES ) if( g_Contents[p].type == NUM_PANES )
continue; /* skip, disabled */ continue; /* skip, disabled */
m_textContents[p].LoadFromFont( THEME->GetPathF("PaneDisplay","text") ); m_textContents[p].LoadFromFont( THEME->GetPathF(sType,"text") );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
ActorUtil::SetXYAndOnCommand( m_textContents[p], sType, this ); ActorUtil::SetXYAndOnCommand( m_textContents[p], sType, this );
m_ContentsFrame.AddChild( &m_textContents[p] ); m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG("PaneDisplay",CString(g_Contents[p].name)+" label") ); m_Labels[p].Load( THEME->GetPathG(sType,CString(g_Contents[p].name)+" label") );
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) ); m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
ActorUtil::SetXYAndOnCommand( m_Labels[p], sType, this ); ActorUtil::SetXYAndOnCommand( m_Labels[p], sType, this );
m_ContentsFrame.AddChild( m_Labels[p] ); m_ContentsFrame.AddChild( m_Labels[p] );
@@ -139,7 +141,7 @@ void PaneDisplay::Load( const CString &sType, PlayerNumber pn )
m_ContentsFrame.SetXY( SHIFT_X(m_PlayerNumber), SHIFT_Y(m_PlayerNumber) ); m_ContentsFrame.SetXY( SHIFT_X(m_PlayerNumber), SHIFT_Y(m_PlayerNumber) );
this->AddChild( &m_ContentsFrame ); this->AddChild( &m_ContentsFrame );
m_sprPaneOver.Load( THEME->GetPathG("PaneDisplay",ssprintf("over p%i", pn+1)) ); m_sprPaneOver.Load( THEME->GetPathG(sType,ssprintf("over p%i", pn+1)) );
m_sprPaneOver->SetName( "Over" ); m_sprPaneOver->SetName( "Over" );
ActorUtil::OnCommand( m_sprPaneOver, sType ); ActorUtil::OnCommand( m_sprPaneOver, sType );
this->AddChild( m_sprPaneOver ); this->AddChild( m_sprPaneOver );
@@ -300,7 +302,7 @@ void PaneDisplay::SetContent( PaneContents c )
case SONG_MACHINE_HIGH_NAME: case SONG_MACHINE_HIGH_NAME:
if( PROFILEMAN->GetMachineProfile()->GetStepsHighScoreList(pSong,pSteps).vHighScores.empty() ) if( PROFILEMAN->GetMachineProfile()->GetStepsHighScoreList(pSong,pSteps).vHighScores.empty() )
{ {
str = ""; str = EMPTY_MACHINE_HIGH_SCORE_NAME;
} }
else else
{ {
@@ -312,7 +314,7 @@ void PaneDisplay::SetContent( PaneContents c )
case COURSE_MACHINE_HIGH_NAME: case COURSE_MACHINE_HIGH_NAME:
if( PROFILEMAN->GetMachineProfile()->GetCourseHighScoreList(pCourse,pTrail).vHighScores.empty() ) if( PROFILEMAN->GetMachineProfile()->GetCourseHighScoreList(pCourse,pTrail).vHighScores.empty() )
{ {
str = ""; str = EMPTY_MACHINE_HIGH_SCORE_NAME;
} }
else else
{ {
stepmania/src/PaneDisplay.h
+3
View File
@@ -10,6 +10,7 @@
#include "BitmapText.h" #include "BitmapText.h"
#include "AutoActor.h" #include "AutoActor.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "ThemeMetric.h"
enum PaneTypes enum PaneTypes
{ {
@@ -91,6 +92,8 @@ private:
}; };
typedef vector<Level> ArrayLevels; typedef vector<Level> ArrayLevels;
ArrayLevels m_Levels[NUM_PANE_CONTENTS]; ArrayLevels m_Levels[NUM_PANE_CONTENTS];
ThemeMetric<CString> EMPTY_MACHINE_HIGH_SCORE_NAME;
}; };
#endif #endif