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

Reverted BitmapText::LoadFromNode back to previous logic.

Browse Source 
BitmapText now looks up font names in Fonts/ if the path doesn't resolve, so LoadFont is obsolete.
Added optional arg to ActorUtil::ResolvePath and GetAttrPath to make them not report an error when something is optional.
This commit is contained in:
Kyzentun
2014-07-29 12:09:40 -06:00
parent 1d5f4ec115
commit 076d67132d
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BitmapText.cpp
+24 -26
View File
@@ -115,39 +115,37 @@ BitmapText::BitmapText( const BitmapText &cpy ):
*this = cpy;
}
void BitmapText::LoadFromNode( const XNode* pNode )
void BitmapText::LoadFromNode( const XNode* node )
{
RString sText;
pNode->GetAttrValue( "Text", sText );
RString sAltText;
pNode->GetAttrValue( "AltText", sAltText );
RString text;
node->GetAttrValue("Text", text);
RString alt_text;
node->GetAttrValue("AltText", alt_text);
ThemeManager::EvaluateString( sText );
ThemeManager::EvaluateString( sAltText );
ThemeManager::EvaluateString(text);
ThemeManager::EvaluateString(alt_text);
RString sFont;
// Allow the Font attribute to be either a path or simply the name of a font.
// If it's a path, it will have a slash in it.
// Also allow it to be set through either "Font" or through "File".
if(!pNode->GetAttrValue("Font", sFont) && !pNode->GetAttrValue("File", sFont))
RString font;
// Pass optional= true so that an error will not be reported if the path
// doesn't resolve to a file. This way, a font can be either a path or the
// name of a font to look up in Fonts/. -Kyz
if(!ActorUtil::GetAttrPath(node, "Font", font, true) &&
!ActorUtil::GetAttrPath(node, "File", font, true))
{
LuaHelpers::ReportScriptErrorFmt("%s: BitmapText: Font or File attribute not found",
ActorUtil::GetWhere(pNode).c_str());
sFont = "Common Normal";
}
if(sFont.find("/") == RString::npos)
{
sFont= THEME->GetPathF("", sFont);
}
else if(!ActorUtil::ResolvePath(sFont, ActorUtil::GetWhere(pNode)))
{
sFont= THEME->GetPathF("", "Common Normal");
if(!node->GetAttrValue("Font", font) &&
!node->GetAttrValue("File", font)) // accept "File" for backward compatibility
{
LuaHelpers::ReportScriptErrorFmt("%s: BitmapText: Font or File attribute"
" not found", ActorUtil::GetWhere(node).c_str());
font = "Common Normal";
}
font = THEME->GetPathF("", font);
}
LoadFromFont( sFont );
LoadFromFont(font);
SetText( sText, sAltText );
Actor::LoadFromNode( pNode );
SetText(text, alt_text);
Actor::LoadFromNode(node);
}
bool BitmapText::LoadFromFont( const RString& sFontFilePath )