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

have Numbers fall back to Fonts (in perparation for removing the Numbers dir altogether)

Browse Source
This commit is contained in:
Chris Danford
2004-05-30 23:23:39 +00:00
parent ef17d8b09e
commit 3cadf4c5d5
18 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ BPMDisplay::BPMDisplay()
void BPMDisplay::Load()
{
m_textBPM.SetName( "Text" );
m_textBPM.LoadFromNumbers( THEME->GetPathToN(m_sName) );
m_textBPM.LoadFromFont( THEME->GetPathToN(m_sName) );
SET_XY_AND_ON_COMMAND( m_textBPM );
m_textBPM.SetDiffuse( NORMAL_COLOR );
this->AddChild( &m_textBPM );
stepmania/src/BitmapText.cpp
+8 -2
View File
@@ -86,14 +86,20 @@ BitmapText::~BitmapText()
bool BitmapText::LoadFromFont( CString sFontFilePath )
{
CHECKPOINT_M( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.c_str()) );
CHECKPOINT_M( ssprintf("BitmapText::LoadFromFont(%s)", sFontFilePath.c_str()) );
// if we're called with a non-ini file, then we're trying to load a 5x3 numbers graphic
bool bIsNumbers = GetExtension(sFontFilePath).CompareNoCase("ini")!=0;
if( bIsNumbers )
{
return LoadFromTextureAndChars( sFontFilePath, "0123456789%. :x" );
}
if( m_pFont ) {
FONT->UnloadFont( m_pFont );
m_pFont = NULL;
}
// load font
m_pFont = FONT->LoadFont( sFontFilePath );
BuildChars();
stepmania/src/BitmapText.h
-1
View File
@@ -24,7 +24,6 @@ public:
bool LoadFromFont( CString sFontName );
bool LoadFromNumbers( CString sTexturePath ) { return LoadFromTextureAndChars(sTexturePath,"0123456789%. :x"); };
bool LoadFromTextureAndChars( CString sTexturePath, CString sChars );
void SetText( CString sText, CString sAlternateText = "", int iWrapWidthPixels = -1 );
void SetMaxWidth( float MaxWidth );
stepmania/src/Combo.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ Combo::Combo()
m_sprCombo.SetDiffuse( RageColor(1,1,1,0) ); // invisible
this->AddChild( &m_sprCombo );
m_textComboNumber.LoadFromNumbers( THEME->GetPathToN("Combo") );
m_textComboNumber.LoadFromFont( THEME->GetPathToN("Combo") );
m_textComboNumber.SetShadowLength( 4 );
m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y );
m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
stepmania/src/DifficultyMeter.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ void DifficultyMeter::Load()
if( SHOW_METER )
{
m_textMeter.SetName( "Meter" );
m_textMeter.LoadFromNumbers( THEME->GetPathToN( ssprintf("%s meter", m_sName.c_str())) );
m_textMeter.LoadFromFont( THEME->GetPathToN( ssprintf("%s meter", m_sName.c_str())) );
SET_XY_AND_ON_COMMAND( m_textMeter );
this->AddChild( &m_textMeter );
}
stepmania/src/LifeMeterBattery.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void LifeMeterBattery::Load( PlayerNumber pn )
if( bPlayerEnabled )
this->AddChild( &m_sprBattery );
m_textNumLives.LoadFromNumbers( THEME->GetPathToN("LifeMeterBattery lives") );
m_textNumLives.LoadFromFont( THEME->GetPathToN("LifeMeterBattery lives") );
m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
m_textNumLives.SetShadowLength( 0 );
if( bPlayerEnabled )
stepmania/src/MenuTimer.cpp
+2 -2
View File
@@ -34,8 +34,8 @@ MenuTimer::MenuTimer()
m_fStallSecondsLeft = MAX_STALL_SECONDS;
m_bPaused = false;
m_textDigit1.LoadFromNumbers( THEME->GetPathToN("MenuTimer") );
m_textDigit2.LoadFromNumbers( THEME->GetPathToN("MenuTimer") );
m_textDigit1.LoadFromFont( THEME->GetPathToN("MenuTimer") );
m_textDigit2.LoadFromFont( THEME->GetPathToN("MenuTimer") );
const float fCharWidth = (float) m_textDigit1.m_pFont->GetLineWidthInSourcePixels(L"0");
m_textDigit1.SetX( -fCharWidth/2 );
stepmania/src/PercentageDisplay.cpp
+2 -2
View File
@@ -31,14 +31,14 @@ void PercentageDisplay::Load( PlayerNumber pn, StageStats* pSource, bool bAutoRe
else
m_textPercent.SetName( ssprintf("PercentP%i", pn+1) );
m_textPercent.LoadFromNumbers( THEME->GetPathN(m_sName,"text") );
m_textPercent.LoadFromFont( THEME->GetPathN(m_sName,"text") );
SET_XY_AND_ON_COMMAND( m_textPercent );
this->AddChild( &m_textPercent );
if( !PREFSMAN->m_bDancePointsForOni && PERCENT_USE_REMAINDER )
{
m_textPercentRemainder.SetName( ssprintf("PercentRemainderP%d",pn+1) );
m_textPercentRemainder.LoadFromNumbers( THEME->GetPathToN(m_sName + " remainder") );
m_textPercentRemainder.LoadFromFont( THEME->GetPathToN(m_sName + " remainder") );
SET_XY_AND_ON_COMMAND( m_textPercentRemainder );
m_textPercentRemainder.SetText( "456" );
this->AddChild( &m_textPercentRemainder );
stepmania/src/ProTimingDisplay.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ static CachedThemeMetric HIT_MINE_COMMAND ("ProTimingDisplay","HitMineCommand");
ProTimingDisplay::ProTimingDisplay()
{
m_Judgment.LoadFromNumbers( THEME->GetPathToN("ProTimingDisplay Judgment") );
m_Judgment.LoadFromFont( THEME->GetPathToN("ProTimingDisplay Judgment") );
m_Judgment.SetName( "Judgment" );
this->AddChild( &m_Judgment );
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
this->AddChild( &m_sprFrame );
// init the text
m_text.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayNormal") );
m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayNormal") );
m_text.SetShadowLength( 0 );
m_iScore = 0;
stepmania/src/ScoreDisplayOni.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ ScoreDisplayOni::ScoreDisplayOni()
this->AddChild( &m_sprFrame );
// init the text
m_text.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayOni") );
m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayOni") );
m_text.SetShadowLength( 0 );
this->AddChild( &m_text );
}
stepmania/src/ScoreDisplayRave.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ ScoreDisplayRave::ScoreDisplayRave()
this->AddChild( &m_sprFrameOverlay );
m_textLevel.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayRave level") );
m_textLevel.LoadFromFont( THEME->GetPathToN("ScoreDisplayRave level") );
m_textLevel.SetText( "1" );
m_textLevel.SetShadowLength( 0 );
this->AddChild( &m_textLevel );
stepmania/src/ScreenEvaluation.cpp
+5 -5
View File
@@ -536,7 +536,7 @@ void ScreenEvaluation::Init()
SET_XY_AND_ON_COMMAND( m_sprSurvivedFrame[p] );
this->AddChild( m_sprSurvivedFrame[p] );
m_textSurvivedNumber[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation stage") );
m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation stage") );
m_textSurvivedNumber[p].SetShadowLength( 0 );
// curewater: edited the "# stages cleared" text so it deducts one if you failed.
// Should be accurate, but I'm not sure if its "standard" that (bool)true = 1. (assumption)
@@ -589,7 +589,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation judge") );
m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation judge") );
m_textJudgeNumbers[l][p].SetShadowLength( 0 );
m_textJudgeNumbers[l][p].SetDiffuse( PlayerToColor(p) );
m_textJudgeNumbers[l][p].SetName( ssprintf("%sNumberP%d",JUDGE_STRING[l],p+1) );
@@ -667,7 +667,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textScore[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation score") );
m_textScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation score") );
m_textScore[p].SetShadowLength( 0 );
m_textScore[p].SetDiffuse( PlayerToColor(p) );
m_textScore[p].SetName( ssprintf("ScoreNumberP%d",p+1) );
@@ -692,7 +692,7 @@ void ScreenEvaluation::Init()
//iTotalScore += stageStats.iScore[p];
m_textTotalScore[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation totalscore") );
m_textTotalScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation totalscore") );
m_textTotalScore[p].SetShadowLength( 0 );
m_textTotalScore[p].SetDiffuse( PlayerToColor(p) );
m_textTotalScore[p].SetName( ssprintf("TotalScoreNumberP%d",p+1) );
@@ -715,7 +715,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textTime[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation time") );
m_textTime[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation time") );
m_textTime[p].SetShadowLength( 0 );
m_textTime[p].SetDiffuse( PlayerToColor(p) );
m_textTime[p].SetName( ssprintf("TimeNumberP%d",p+1) );
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -457,7 +457,7 @@ void ScreenGameplay::Init()
this->AddChild( &m_meterSongPosition );
m_MaxCombo.LoadFromNumbers( THEME->GetPathToN("ScreenGameplay max combo") );
m_MaxCombo.LoadFromFont( THEME->GetPathToN("ScreenGameplay max combo") );
m_MaxCombo.SetName( "MaxCombo" );
SET_XY( m_MaxCombo );
m_MaxCombo.SetText( ssprintf("%d", g_CurStageStats.iMaxCombo[GAMESTATE->m_MasterPlayerNumber]) ); // TODO: Make this work for both players
@@ -524,7 +524,7 @@ void ScreenGameplay::Init()
FOREACH_EnabledPlayer(p)
{
m_textCourseSongNumber[p].LoadFromNumbers( THEME->GetPathToN("ScreenGameplay song num") );
m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathToN("ScreenGameplay song num") );
m_textCourseSongNumber[p].SetShadowLength( 0 );
m_textCourseSongNumber[p].SetName( ssprintf("SongNumberP%d%s",p+1,bExtra?"Extra":"") );
SET_XY( m_textCourseSongNumber[p] );
stepmania/src/ScreenSelectCourse.cpp
+2 -2
View File
@@ -83,12 +83,12 @@ ScreenSelectCourse::ScreenSelectCourse( CString sClassName ) : ScreenWithMenuEle
m_sprBannerFrame.SetXY( BANNER_FRAME_X, BANNER_FRAME_Y );
this->AddChild( &m_sprBannerFrame );
m_textNumSongs.LoadFromNumbers( THEME->GetPathToN("ScreenSelectCourse num songs") );
m_textNumSongs.LoadFromFont( THEME->GetPathToN("ScreenSelectCourse num songs") );
m_textNumSongs.SetShadowLength( 0 );
m_textNumSongs.SetXY( STAGES_X, STAGES_Y );
this->AddChild( &m_textNumSongs );
m_textTime.LoadFromNumbers( THEME->GetPathToN("ScreenSelectCourse total time") );
m_textTime.LoadFromFont( THEME->GetPathToN("ScreenSelectCourse total time") );
m_textTime.SetShadowLength( 0 );
m_textTime.SetXY( TIME_X, TIME_Y );
this->AddChild( &m_textTime );
stepmania/src/ScreenSelectGroup.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_sprFrame );
m_textNumber.SetName( "Number" );
m_textNumber.LoadFromNumbers( THEME->GetPathToN("ScreenSelectGroup num songs") );
m_textNumber.LoadFromFont( THEME->GetPathToN("ScreenSelectGroup num songs") );
this->AddChild( &m_textNumber );
m_sprContents.SetName( "Contents" );
stepmania/src/ScreenSelectMusic.cpp
+3 -3
View File
@@ -206,12 +206,12 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_textSongOptions );
m_textNumSongs.SetName( "NumSongs" );
m_textNumSongs.LoadFromNumbers( THEME->GetPathN(m_sName,"num songs") );
m_textNumSongs.LoadFromFont( THEME->GetPathN(m_sName,"num songs") );
SET_XY( m_textNumSongs );
this->AddChild( &m_textNumSongs );
m_textTotalTime.SetName( "TotalTime" );
m_textTotalTime.LoadFromNumbers( THEME->GetPathN(m_sName,"total time") );
m_textTotalTime.LoadFromFont( THEME->GetPathN(m_sName,"total time") );
SET_XY( m_textTotalTime );
this->AddChild( &m_textTotalTime );
@@ -290,7 +290,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_sprHighScoreFrame[p] );
m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) );
m_textHighScore[p].LoadFromNumbers( THEME->GetPathN(m_sName,"score") );
m_textHighScore[p].LoadFromFont( THEME->GetPathN(m_sName,"score") );
m_textHighScore[p].SetShadowLength( 0 );
m_textHighScore[p].SetDiffuse( PlayerToColor(p) );
SET_XY( m_textHighScore[p] );
stepmania/src/ThemeManager.cpp
+3
View File
@@ -303,6 +303,9 @@ try_element_again:
if( asElementPaths.size() == 0 )
{
// HACK: have Numbers fall back to fonts. Eventually Numbers will be removed.
if( category == Numbers )
return GetPathToRaw( sThemeName, Fonts, sClassName, sElement ) ;
return ""; // This isn't fatal.
}