diff --git a/stepmania/src/ActorSound.cpp b/stepmania/src/ActorSound.cpp index dd782f74f5..0d3e36a83c 100644 --- a/stepmania/src/ActorSound.cpp +++ b/stepmania/src/ActorSound.cpp @@ -24,10 +24,7 @@ void ActorSound::LoadFromNode( const XNode* pNode ) RString sFile; if( ActorUtil::GetAttrPath(pNode, "File", sFile) ) - { - ActorUtil::ResolvePath( sFile, ActorUtil::GetWhere(pNode) ); Load( sFile ); - } } // lua start diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index 07fdaffc47..c4eaa1aed7 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -47,8 +47,6 @@ void DifficultyIcon::LoadFromNode( const XNode* pNode ) if( !ActorUtil::GetAttrPath(pNode, "File", sFile) ) RageException::Throw( "%s: DifficultyIcon: missing the \"File\" attribute.", ActorUtil::GetWhere(pNode).c_str() ); - ActorUtil::ResolvePath( sFile, ActorUtil::GetWhere(pNode) ); - Load( sFile ); // skip Sprite::LoadFromNode diff --git a/stepmania/src/MeterDisplay.cpp b/stepmania/src/MeterDisplay.cpp index 0930c6a6a9..db9db7b015 100644 --- a/stepmania/src/MeterDisplay.cpp +++ b/stepmania/src/MeterDisplay.cpp @@ -42,8 +42,6 @@ void MeterDisplay::LoadFromNode( const XNode* pNode ) if( !ActorUtil::GetAttrPath(pNode, "StreamPath", sStreamPath) ) RageException::Throw( "%s: MeterDisplay: missing the \"StreamPath\" attribute", ActorUtil::GetWhere(pNode).c_str() ); - ActorUtil::ResolvePath( sStreamPath, ActorUtil::GetWhere(pNode) ); - m_sprStream.Load( sStreamPath ); m_sprStream->SetZoomX( m_fStreamWidth / m_sprStream->GetUnzoomedWidth() ); this->AddChild( m_sprStream ); diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 3971fb6a63..b858e20ca5 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -108,14 +108,15 @@ void Sprite::Load( RageTextureID ID ) void Sprite::LoadFromNode( const XNode* pNode ) { + /* Texture may refer to the ID of a render target; if it's already registered, + * use it without trying ot resolve it. */ RString sPath; - ActorUtil::GetAttrPath( pNode, "Texture", sPath ); + pNode->GetAttrValue( "Texture", sPath ); + if( !sPath.empty() && !TEXTUREMAN->IsTextureRegistered( RageTextureID(sPath) ) ) + ActorUtil::GetAttrPath( pNode, "Texture", sPath ); if( !sPath.empty() ) { - if( !TEXTUREMAN->IsTextureRegistered( RageTextureID(sPath) ) ) - ActorUtil::ResolvePath( sPath, ActorUtil::GetWhere(pNode) ); - // Load the texture LoadFromTexture( sPath );