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

ThemeManager::EvaluateString was called here for three things:

Browse Source 
- 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:
Glenn Maynard
2005-09-06 04:34:44 +00:00
parent 1ab1ba5efc
commit f5f2f4a885
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
-2
View File
@@ -227,7 +227,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
CString sKeyName = pAttr->m_sName; /* "OnCommand" */ CString sKeyName = pAttr->m_sName; /* "OnCommand" */
CString sValue = pAttr->m_sValue; CString sValue = pAttr->m_sValue;
THEME->EvaluateString( sValue );
apActorCommands apac( new ActorCommands( sValue ) ); apActorCommands apac( new ActorCommands( sValue ) );
CString sCmdName = sKeyName.Left( sKeyName.size()-7 ); CString sCmdName = sKeyName.Left( sKeyName.size()-7 );
@@ -251,7 +250,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
c->GetAttrValue( "Value", sValue ); c->GetAttrValue( "Value", sValue );
THEME->EvaluateString( sName ); THEME->EvaluateString( sName );
THEME->EvaluateString( sValue );
apActorCommands apac( new ActorCommands( sValue ) ); apActorCommands apac( new ActorCommands( sValue ) );
AddCommand( sName, apac ); AddCommand( sName, apac );
stepmania/src/ThemeManager.cpp
+1 -1
View File
@@ -721,7 +721,7 @@ Commands ThemeManager::GetMetricM( const CString &sClassName, const CString &sVa
apActorCommands ThemeManager::GetMetricA( const CString &sClassName, const CString &sValueName ) 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 ) ); return apActorCommands( new ActorCommands( sValue ) );
} }