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

BitmapText: check both File and Font as path

Browse Source 
Allow BitmapText to specify font from Theme/Fonts as well as locally,
using either the Font or the old-style File attribute.
This commit is contained in:
Devin J. Pohly
2014-02-20 10:59:49 -05:00
parent 000498ba63
commit 59674ad6f2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BitmapText.cpp
+8 -3
View File
@@ -126,11 +126,16 @@ void BitmapText::LoadFromNode( const XNode* pNode )
ThemeManager::EvaluateString( sAltText ); ThemeManager::EvaluateString( sAltText );
RString sFont; RString sFont;
if( !ActorUtil::GetAttrPath(pNode, "File", sFont) ) if( !ActorUtil::GetAttrPath(pNode, "Font", sFont) &&
!ActorUtil::GetAttrPath(pNode, "File", sFont) )
{ {
if( !pNode->GetAttrValue("Font", sFont) ) // accept "File" for backward compatibility if( !pNode->GetAttrValue("Font", sFont) &&
RageException::Throw( "%s: BitmapText: missing the File attribute", !pNode->GetAttrValue("File", sFont) ) // accept "File" for backward compatibility
{
LOG->Warn( "%s: BitmapText: Font or File attribute not found",
ActorUtil::GetWhere(pNode).c_str() ); ActorUtil::GetWhere(pNode).c_str() );
sFont = "Common Normal";
}
sFont = THEME->GetPathF( "", sFont ); sFont = THEME->GetPathF( "", sFont );
} }