unneeded LuaHelpers::RunAtExpressionS
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 );
|
||||
|
||||
|
||||
@@ -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.",
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) != "/" )
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user