From e0b788de16e5d0c1e40d439be0285f452a13d1e0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 9 Oct 2006 01:22:17 +0000 Subject: [PATCH] unneeded LuaHelpers::RunAtExpressionS --- stepmania/src/ActorSound.cpp | 1 - stepmania/src/ActorUtil.cpp | 2 -- stepmania/src/BitmapText.cpp | 1 - stepmania/src/DifficultyIcon.cpp | 1 - stepmania/src/HoldJudgment.cpp | 1 - stepmania/src/Judgment.cpp | 2 -- stepmania/src/MeterDisplay.cpp | 1 - stepmania/src/Model.cpp | 4 ---- stepmania/src/Sprite.cpp | 2 -- stepmania/src/ThemeManager.cpp | 5 ----- 10 files changed, 20 deletions(-) diff --git a/stepmania/src/ActorSound.cpp b/stepmania/src/ActorSound.cpp index f22ea03f2e..c9dc61f792 100644 --- a/stepmania/src/ActorSound.cpp +++ b/stepmania/src/ActorSound.cpp @@ -25,7 +25,6 @@ void ActorSound::LoadFromNode( const RString& sDir, const XNode* pNode ) RString sFile; if( pNode->GetAttrValue("File", sFile) || pNode->GetAttrValue("Path", sFile) ) /* Path deprecated */ { - LuaHelpers::RunAtExpressionS( sFile ); FixSlashesInPlace( sFile ); RString sNewPath = sFile.Left(1) == "/"? sFile : sDir+sFile; diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 28ec9b24ff..82cfcfa6cc 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -183,7 +183,6 @@ Actor* ActorUtil::LoadFromNode( const RString& sDir, const XNode* pNode, Actor * RString expr; if( pNode->GetAttrValue("Condition",expr) ) { - LuaHelpers::RunAtExpressionS( expr ); if( !LuaHelpers::RunExpressionB(expr) ) return NULL; } @@ -239,7 +238,6 @@ Actor* ActorUtil::LoadFromNode( const RString& sDir, const XNode* pNode, Actor * RString sFile; pNode->GetAttrValue( "File", sFile ); - LuaHelpers::RunAtExpressionS( sFile ); bool bIsAbsolutePath = sFile.Left(1) == "/"; FixSlashesInPlace( sFile ); diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index ba4e2ba095..3d5f3946ac 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -109,7 +109,6 @@ void BitmapText::LoadFromNode( const RString& sDir, const XNode* pNode ) pNode->GetAttrValue( "Font", sFont ); if( sFont.empty() ) pNode->GetAttrValue( "File", sFont ); // accept "File" for backward compatibility - LuaHelpers::RunAtExpressionS( sFont ); if( sFont == "" ) RageException::Throw( "An object \"%s\" in \"%s\" is missing the Font attribute.", diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index 555a1199a1..803d83da45 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -47,7 +47,6 @@ void DifficultyIcon::LoadFromNode( const RString& sDir, const XNode* pNode ) if( !pNode->GetAttrValue( "File", sFile ) ) RageException::Throw( "MeterDisplay in \"%s\" missing \"File\" attribute.", sDir.c_str() ); - LuaHelpers::RunAtExpressionS( sFile ); if( !sFile.empty() && sFile[0] != '/' ) { sFile = sDir + sFile; diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp index ce6c7fee75..3df4b51519 100644 --- a/stepmania/src/HoldJudgment.cpp +++ b/stepmania/src/HoldJudgment.cpp @@ -30,7 +30,6 @@ void HoldJudgment::LoadFromNode( const RString& sDir, const XNode* pNode ) RString sFile; if( !pNode->GetAttrValue("File", sFile) ) RageException::Throw( "HoldJudgment node in \"%s\" is missing the attribute \"File\"", sDir.c_str() ); - LuaHelpers::RunAtExpressionS( sFile ); if( sFile.Left(1) != "/" ) sFile = sDir+sFile; diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp index b010ec54c4..1c2c6ee7cb 100644 --- a/stepmania/src/Judgment.cpp +++ b/stepmania/src/Judgment.cpp @@ -21,8 +21,6 @@ void Judgment::LoadFromNode( const RString& sDir, const XNode* pNode ) RString sFile; if( pNode->GetAttrValue("File", sFile) ) { - LuaHelpers::RunAtExpressionS( sFile ); - if( sFile.Left(1) != "/" ) sFile = sDir+sFile; diff --git a/stepmania/src/MeterDisplay.cpp b/stepmania/src/MeterDisplay.cpp index 9fec83c86b..e66e3ed999 100644 --- a/stepmania/src/MeterDisplay.cpp +++ b/stepmania/src/MeterDisplay.cpp @@ -43,7 +43,6 @@ void MeterDisplay::LoadFromNode( const RString& sDir, const XNode* pNode ) if( !pNode->GetAttrValue( "StreamPath", sStreamPath ) ) RageException::Throw( "MeterDisplay in \"%s\" is missing the \"StreamPath\" attribute.", sDir.c_str() ); - LuaHelpers::RunAtExpressionS( sStreamPath ); if( !sStreamPath.empty() && sStreamPath[0] != '/' ) { sStreamPath = sDir + sStreamPath; diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index e0bc8961f9..8ef6324c56 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -116,10 +116,6 @@ void Model::LoadFromNode( const RString& sDir, const XNode* pNode ) pNode->GetAttrValue( "Bones", s3 ); if( !s1.empty() || !s2.empty() || !s3.empty() ) { - LuaHelpers::RunAtExpressionS( s1 ); - LuaHelpers::RunAtExpressionS( s2 ); - LuaHelpers::RunAtExpressionS( s3 ); - ASSERT( !s1.empty() && !s2.empty() && !s3.empty() ); if( s1.Left(1) != "/" ) diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 8154a91f2b..2511cfe1d9 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -111,8 +111,6 @@ void Sprite::LoadFromNode( const RString& sDir, const XNode* pNode ) RString sPath; if( pNode->GetAttrValue( "Texture", sPath ) ) { - LuaHelpers::RunAtExpressionS( sPath ); - bool bIsAbsolutePath = sPath.Left(1) == "/"; sPath = bIsAbsolutePath ? sPath : sDir+sPath; } diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index a4b2011794..bd089059bc 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -983,11 +983,6 @@ apActorCommands ThemeManager::GetMetricA( const RString &sClassName, const RStri void ThemeManager::EvaluateString( RString &sText ) { - /* If the string begins with an @, then this is a Lua expression - * that should be evaluated immediately. - * Still do font aliases on the resulting string. */ - LuaHelpers::RunAtExpressionS( sText ); - FontCharAliases::ReplaceMarkers( sText ); }