ThemeManager::EvaluateString was called here for three things:
- RunAtExpressionS. Using @ to generate command lists is no longer allowed; it's too expensive and clumsy, and is no longer needed. - "::" for newlines. This isn't needed, since the string is a Lua expression; use "\n". - FontCharAliases::ReplaceMarkers. This only makes sense for settext calls. (The latter two will still be supported by settext directly.)
This commit is contained in:
@@ -227,7 +227,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
|
||||
CString sKeyName = pAttr->m_sName; /* "OnCommand" */
|
||||
|
||||
CString sValue = pAttr->m_sValue;
|
||||
THEME->EvaluateString( sValue );
|
||||
apActorCommands apac( new ActorCommands( sValue ) );
|
||||
|
||||
CString sCmdName = sKeyName.Left( sKeyName.size()-7 );
|
||||
@@ -251,7 +250,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
|
||||
c->GetAttrValue( "Value", sValue );
|
||||
|
||||
THEME->EvaluateString( sName );
|
||||
THEME->EvaluateString( sValue );
|
||||
apActorCommands apac( new ActorCommands( sValue ) );
|
||||
|
||||
AddCommand( sName, apac );
|
||||
|
||||
@@ -721,7 +721,7 @@ Commands ThemeManager::GetMetricM( const CString &sClassName, const CString &sVa
|
||||
|
||||
apActorCommands ThemeManager::GetMetricA( const CString &sClassName, const CString &sValueName )
|
||||
{
|
||||
CString sValue = GetMetric( sClassName, sValueName ); // Use non-raw so that Lua expressions are allowed
|
||||
CString sValue = GetMetricRaw( sClassName, sValueName );
|
||||
return apActorCommands( new ActorCommands( sValue ) );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user