Reverted BitmapText::LoadFromNode back to previous logic.
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:
+2
-2
@@ -114,10 +114,10 @@ namespace ActorUtil
|
||||
Actor* MakeActor( const RString &sPath, Actor *pParentActor = NULL );
|
||||
RString GetSourcePath( const XNode *pNode );
|
||||
RString GetWhere( const XNode *pNode );
|
||||
bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut );
|
||||
bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut, bool optional= false );
|
||||
bool LoadTableFromStackShowErrors( Lua *L );
|
||||
|
||||
bool ResolvePath( RString &sPath, const RString &sName );
|
||||
bool ResolvePath( RString &sPath, const RString &sName, bool optional= false );
|
||||
|
||||
void SortByZPosition( vector<Actor*> &vActors );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user