From 7319b284ab9374ac7dda3cd4b98ffebd2ede43bf Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Feb 2007 11:27:17 +0000 Subject: [PATCH] cacept paths like other actors --- stepmania/src/BitmapText.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 3fc836c570..d6e313479f 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -107,14 +107,18 @@ void BitmapText::LoadFromNode( const XNode* pNode ) RString sFont; pNode->GetAttrValue( "Font", sFont ); + ActorUtil::GetAttrPath( pNode, "FilFont", sFont ); if( sFont.empty() ) - pNode->GetAttrValue( "File", sFont ); // accept "File" for backward compatibility + ActorUtil::GetAttrPath( pNode, "File", sFont ); // accept "File" for backward compatibility if( sFont == "" ) RageException::Throw( "%s: BitmapText: missing the Font attribute", ActorUtil::GetWhere(pNode).c_str() ); - LoadFromFont( THEME->GetPathF( "", sFont ) ); + if( sFont.Left(1) != "/" ) + sFont = THEME->GetPathF( "", sFont ); + LoadFromFont( sFont ); + SetText( sText, sAltText ); Actor::LoadFromNode( pNode );