From 0022bc3338627926ec6bfde329e95a302f89095b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 02:08:27 +0000 Subject: [PATCH] cleanup --- stepmania/src/BitmapText.cpp | 2 +- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/ScreenDebugOverlay.cpp | 6 +++--- stepmania/src/ScreenHowToPlay.cpp | 2 +- stepmania/src/ScreenSyncOverlay.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 3c2346a0e6..f09ca4d142 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -101,7 +101,7 @@ void BitmapText::LoadFromNode( const CString& sDir, const XNode* pNode ) RageException::Throw( "An object '%s' in '%s' is missing the Font attribute", pNode->m_sName.c_str(), sDir.c_str() ); - LoadFromFont( THEME->GetPathToF( sFont ) ); + LoadFromFont( THEME->GetPathF( "", sFont ) ); SetText( sText, sAltText ); Actor::LoadFromNode( sDir, pNode ); diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 0ee8bebfb1..484ad3cd84 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -824,7 +824,7 @@ void GameCommand::ApplySelf( const vector &vpns ) const if( m_iUnlockIndex != -1 ) UNLOCKMAN->UnlockCode( m_iUnlockIndex ); if( m_sSoundPath != "" ) - SOUND->PlayOnce( THEME->GetPathToS( m_sSoundPath ) ); + SOUND->PlayOnce( THEME->GetPathS( "", m_sSoundPath ) ); if( m_iWeightPounds != -1 ) FOREACH_CONST( PlayerNumber, vpns, pn ) PROFILEMAN->GetProfile(*pn)->m_iWeightPounds = m_iWeightPounds; diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index de9c859d00..a3d24c73a9 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -151,7 +151,7 @@ void ScreenDebugOverlay::Init() m_Quad.SetDiffuse( RageColor(0, 0, 0, 0.5f) ); this->AddChild( &m_Quad ); - m_textHeader.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textHeader.LoadFromFont( THEME->GetPathF("Common", "normal") ); m_textHeader.SetHorizAlign( Actor::align_left ); m_textHeader.SetX( SCREEN_LEFT+20 ); m_textHeader.SetY( SCREEN_TOP+20 ); @@ -163,7 +163,7 @@ void ScreenDebugOverlay::Init() { { BitmapText *pT1 = new BitmapText; - pT1->LoadFromFont( THEME->GetPathToF("Common normal") ); + pT1->LoadFromFont( THEME->GetPathF("Common", "normal") ); pT1->SetHorizAlign( Actor::align_right ); pT1->SetText( "blah" ); pT1->SetShadowLength( 2 ); @@ -172,7 +172,7 @@ void ScreenDebugOverlay::Init() } { BitmapText *pT2 = new BitmapText; - pT2->LoadFromFont( THEME->GetPathToF("Common normal") ); + pT2->LoadFromFont( THEME->GetPathF("Common", "normal") ); pT2->SetHorizAlign( Actor::align_left ); pT2->SetText( "blah" ); pT2->SetShadowLength( 2 ); diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index dbb871c14b..ae7c89088f 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -136,7 +136,7 @@ void ScreenHowToPlay::Init() if( USEPLAYER ) { SMLoader smfile; - smfile.LoadFromSMFile( THEME->GetPathToO(STEPFILE), m_Song, false ); + smfile.LoadFromSMFile( THEME->GetPathO("", STEPFILE), m_Song, false ); m_Song.AddAutoGenNotes(); const Style* pStyle = GAMESTATE->GetCurrentStyle(); diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp index f615fd0de1..14b71e28c6 100644 --- a/stepmania/src/ScreenSyncOverlay.cpp +++ b/stepmania/src/ScreenSyncOverlay.cpp @@ -29,7 +29,7 @@ void ScreenSyncOverlay::Init() m_quad.SetXY( SCREEN_CENTER_X+10, SCREEN_TOP+100 ); this->AddChild( &m_quad ); - m_textHelp.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textHelp.LoadFromFont( THEME->GetPathF("Common", "normal") ); m_textHelp.SetHorizAlign( Actor::align_left ); m_textHelp.SetXY( SCREEN_CENTER_X+20, SCREEN_TOP+100 ); m_textHelp.SetDiffuseAlpha( 0 ); @@ -50,7 +50,7 @@ void ScreenSyncOverlay::Init() m_quad.ZoomToWidth( m_textHelp.GetZoomedWidth()+20 ); m_quad.ZoomToHeight( m_textHelp.GetZoomedHeight()+20 ); - m_textStatus.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textStatus.LoadFromFont( THEME->GetPathF("Common", "normal") ); m_textStatus.SetHorizAlign( Actor::align_center ); m_textStatus.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+150 ); m_textStatus.SetZoom( 0.8f );