diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 8847e9f2e7..6cd63c21d1 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -44,7 +44,6 @@ Sprite::Sprite( const Sprite &cpy ): Actor( cpy ) { #define CPY(a) a = cpy.a - CPY( m_sSpritePath ); CPY( m_bDrawIfTextureNull ); CPY( m_States ); CPY( m_iCurState ); @@ -130,8 +129,8 @@ retry: } if( sPath == sDir ) { - RString sMessage = ssprintf( "'%s' has a texture '%s' that collapses to './'.", - m_sSpritePath.c_str(), sTextureFile.c_str() ); + RString sMessage = ssprintf( "A file in '%s' has a texture '%s' that collapses to './'.", + sDir.c_str(), sTextureFile.c_str() ); switch( Dialog::AbortRetryIgnore(sMessage) ) { case Dialog::abort: @@ -167,7 +166,7 @@ retry: break; if( newState.iFrameIndex >= m_pTexture->GetNumFrames() ) RageException::Throw( "In '%s', %s is %d, but the texture %s only has %d frames.", - m_sSpritePath.c_str(), sFrameKey.c_str(), newState.iFrameIndex, sPath.c_str(), m_pTexture->GetNumFrames() ); + sDir.c_str(), sFrameKey.c_str(), newState.iFrameIndex, sPath.c_str(), m_pTexture->GetNumFrames() ); if( !pNode->GetAttrValue(sDelayKey, newState.fDelay) ) break; diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h index 18c258487a..cac4542cfe 100644 --- a/stepmania/src/Sprite.h +++ b/stepmania/src/Sprite.h @@ -77,7 +77,6 @@ protected: void DrawTexture( const TweenState *state ); - RString m_sSpritePath; RageTexture* m_pTexture; bool m_bDrawIfTextureNull;