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

use File in Lua; use Font in XML, for compatibility. Only XML's paths

Browse Source 
need manual lookups.
This commit is contained in:
Glenn Maynard
2007-02-16 07:55:59 +00:00
parent 0bb594d32f
commit ae45448ade
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+6 -8
View File
@@ -106,16 +106,14 @@ void BitmapText::LoadFromNode( const XNode* pNode )
ThemeManager::EvaluateString( sAltText ); ThemeManager::EvaluateString( sAltText );
RString sFont; RString sFont;
ActorUtil::GetAttrPath( pNode, "Font", sFont ); if( !ActorUtil::GetAttrPath(pNode, "File", sFont) )
if( sFont.empty() ) {
ActorUtil::GetAttrPath( pNode, "File", sFont ); // accept "File" for backward compatibility if( !pNode->GetAttrValue("Font", sFont) ) // accept "File" for backward compatibility
RageException::Throw( "%s: BitmapText: missing the File attribute",
if( sFont == "" )
RageException::Throw( "%s: BitmapText: missing the Font attribute",
ActorUtil::GetWhere(pNode).c_str() ); ActorUtil::GetWhere(pNode).c_str() );
if( sFont.Left(1) != "/" )
sFont = THEME->GetPathF( "", sFont ); sFont = THEME->GetPathF( "", sFont );
}
LoadFromFont( sFont ); LoadFromFont( sFont );
SetText( sText, sAltText ); SetText( sText, sAltText );