From f5f2f4a885cf7a5c5cafd087fc71e064c1c1b16e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 6 Sep 2005 04:34:44 +0000 Subject: [PATCH] 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.) --- stepmania/src/Actor.cpp | 2 -- stepmania/src/ThemeManager.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index c4f95923d3..4362cbaf04 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -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 ); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 467b07a2f9..a4c61ad646 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -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 ) ); }