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

GetPath*N->GetPath*F

Browse Source
This commit is contained in:
Chris Danford
2004-07-25 06:29:50 +00:00
parent 64628fac21
commit 504ba6c163
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ BPMDisplay::BPMDisplay()
void BPMDisplay::Load()
{
m_textBPM.SetName( "Text" );
m_textBPM.LoadFromFont( THEME->GetPathToN(m_sName) );
m_textBPM.LoadFromFont( THEME->GetPathToF(m_sName) );
SET_XY_AND_ON_COMMAND( m_textBPM );
m_textBPM.SetDiffuse( NORMAL_COLOR );
this->AddChild( &m_textBPM );
stepmania/src/Combo.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ Combo::Combo()
m_sprCombo.SetDiffuse( RageColor(1,1,1,0) ); // invisible
this->AddChild( &m_sprCombo );
m_textComboNumber.LoadFromFont( THEME->GetPathToN("Combo") );
m_textComboNumber.LoadFromFont( THEME->GetPathToF("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
@@ -79,7 +79,7 @@ void DifficultyMeter::Load()
if( SHOW_METER )
{
m_textMeter.SetName( "Meter" );
m_textMeter.LoadFromFont( THEME->GetPathN(m_sName,"meter") );
m_textMeter.LoadFromFont( THEME->GetPathF(m_sName,"meter") );
SET_XY_AND_ON_COMMAND( m_textMeter );
this->AddChild( &m_textMeter );
}
stepmania/src/InputMapper.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
{
const AutoJoyMapping& mapping = g_AutoJoyMappings[j];
if( pGameDef != GAMESTATE->GetGameDefFromString(mapping.szGame) )
if( pGameDef != GAMEMAN->StringToGameType(mapping.szGame) )
continue; // games don't match
CString sDriverRegex = mapping.szDriverRegex;
stepmania/src/LifeMeterBattery.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ void LifeMeterBattery::Load( PlayerNumber pn )
if( bPlayerEnabled )
this->AddChild( &m_sprBattery );
m_textNumLives.LoadFromFont( THEME->GetPathToN("LifeMeterBattery lives") );
m_textNumLives.LoadFromFont( THEME->GetPathToF("LifeMeterBattery lives") );
m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
m_textNumLives.SetShadowLength( 0 );
if( bPlayerEnabled )
stepmania/src/MenuTimer.cpp
+2 -2
View File
@@ -23,8 +23,8 @@ MenuTimer::MenuTimer()
m_fStallSecondsLeft = MAX_STALL_SECONDS;
m_bPaused = false;
m_textDigit1.LoadFromFont( THEME->GetPathToN("MenuTimer") );
m_textDigit2.LoadFromFont( THEME->GetPathToN("MenuTimer") );
m_textDigit1.LoadFromFont( THEME->GetPathToF("MenuTimer") );
m_textDigit2.LoadFromFont( THEME->GetPathToF("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.LoadFromFont( THEME->GetPathN(m_sName,"text") );
m_textPercent.LoadFromFont( THEME->GetPathF(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.LoadFromFont( THEME->GetPathToN(m_sName + " remainder") );
m_textPercentRemainder.LoadFromFont( THEME->GetPathF(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
@@ -14,7 +14,7 @@ static CachedThemeMetric HIT_MINE_COMMAND ("ProTimingDisplay","HitMineCommand");
ProTimingDisplay::ProTimingDisplay()
{
m_Judgment.LoadFromFont( THEME->GetPathToN("ProTimingDisplay Judgment") );
m_Judgment.LoadFromFont( THEME->GetPathF("ProTimingDisplay","Judgment") );
m_Judgment.SetName( "Judgment" );
this->AddChild( &m_Judgment );
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
this->AddChild( &m_sprFrame );
// init the text
m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayNormal") );
m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayNormal") );
m_text.SetShadowLength( 0 );
m_iScore = 0;
stepmania/src/ScoreDisplayOni.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ ScoreDisplayOni::ScoreDisplayOni()
this->AddChild( &m_sprFrame );
// init the text
m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayOni") );
m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayOni") );
m_text.SetShadowLength( 0 );
this->AddChild( &m_text );
}
stepmania/src/ScoreDisplayRave.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ ScoreDisplayRave::ScoreDisplayRave()
this->AddChild( &m_sprFrameOverlay );
m_textLevel.LoadFromFont( THEME->GetPathToN("ScoreDisplayRave level") );
m_textLevel.LoadFromFont( THEME->GetPathF("ScoreDisplayRave","level") );
m_textLevel.SetText( "1" );
m_textLevel.SetShadowLength( 0 );
this->AddChild( &m_textLevel );
stepmania/src/ScreenEvaluation.cpp
+5 -5
View File
@@ -568,7 +568,7 @@ void ScreenEvaluation::Init()
SET_XY_AND_ON_COMMAND( m_sprSurvivedFrame[p] );
this->AddChild( m_sprSurvivedFrame[p] );
m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation stage") );
m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathF("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)
@@ -621,7 +621,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation judge") );
m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathF("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) );
@@ -693,7 +693,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation score") );
m_textScore[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","score") );
m_textScore[p].SetShadowLength( 0 );
m_textScore[p].SetDiffuse( PlayerToColor(p) );
m_textScore[p].SetName( ssprintf("ScoreNumberP%d",p+1) );
@@ -718,7 +718,7 @@ void ScreenEvaluation::Init()
//iTotalScore += stageStats.iScore[p];
m_textTotalScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation totalscore") );
m_textTotalScore[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","totalscore") );
m_textTotalScore[p].SetShadowLength( 0 );
m_textTotalScore[p].SetDiffuse( PlayerToColor(p) );
m_textTotalScore[p].SetName( ssprintf("TotalScoreNumberP%d",p+1) );
@@ -741,7 +741,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textTime[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation time") );
m_textTime[p].LoadFromFont( THEME->GetPathF("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
@@ -439,7 +439,7 @@ void ScreenGameplay::Init()
this->AddChild( &m_meterSongPosition );
m_MaxCombo.LoadFromFont( THEME->GetPathN(m_sName,"max combo") );
m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"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
@@ -506,7 +506,7 @@ void ScreenGameplay::Init()
FOREACH_EnabledPlayer(p)
{
m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathN(m_sName,"song num") );
m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathF(m_sName,"song num") );
m_textCourseSongNumber[p].SetShadowLength( 0 );
m_textCourseSongNumber[p].SetName( ssprintf("SongNumberP%d",p+1) );
SET_XY( m_textCourseSongNumber[p] );
stepmania/src/ScreenSelectGroup.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_sprFrame );
m_textNumber.SetName( "Number" );
m_textNumber.LoadFromFont( THEME->GetPathToN("ScreenSelectGroup num songs") );
m_textNumber.LoadFromFont( THEME->GetPathF("ScreenSelectGroup","num songs") );
this->AddChild( &m_textNumber );
m_sprContents.SetName( "Contents" );
stepmania/src/ScreenSelectMusic.cpp
+3 -3
View File
@@ -178,12 +178,12 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_textSongOptions );
m_textNumSongs.SetName( "NumSongs" );
m_textNumSongs.LoadFromFont( THEME->GetPathN(m_sName,"num songs") );
m_textNumSongs.LoadFromFont( THEME->GetPathF(m_sName,"num songs") );
SET_XY( m_textNumSongs );
this->AddChild( &m_textNumSongs );
m_textTotalTime.SetName( "TotalTime" );
m_textTotalTime.LoadFromFont( THEME->GetPathN(m_sName,"total time") );
m_textTotalTime.LoadFromFont( THEME->GetPathF(m_sName,"total time") );
SET_XY( m_textTotalTime );
this->AddChild( &m_textTotalTime );
@@ -259,7 +259,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_sprHighScoreFrame[p] );
m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) );
m_textHighScore[p].LoadFromFont( THEME->GetPathN(m_sName,"score") );
m_textHighScore[p].LoadFromFont( THEME->GetPathF(m_sName,"score") );
m_textHighScore[p].SetShadowLength( 0 );
m_textHighScore[p].SetDiffuse( PlayerToColor(p) );
SET_XY( m_textHighScore[p] );