From c77ddb2107dc446d86e42669f670c18c6e58d756 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 7 Nov 2003 20:55:30 +0000 Subject: [PATCH] Reduce dependencies, const fix. --- stepmania/src/Sprite.cpp | 9 +++++++++ stepmania/src/Sprite.h | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 39b97b67c7..bfe1ec6041 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -20,6 +20,7 @@ #include "RageException.h" #include "PrefsManager.h" #include "RageDisplay.h" +#include "RageTexture.h" #include "GameConstantsAndTypes.h" #include "SDL_utils.h" #include "ActorUtil.h" @@ -412,6 +413,14 @@ void Sprite::SetState( int iNewState ) m_fSecsIntoState = 0.0; } +CString Sprite::GetTexturePath() const +{ + if( m_pTexture==NULL ) + return ""; + + return m_pTexture->GetID().filename; +} + void Sprite::SetCustomTextureRect( const RectF &new_texcoord_frect ) { m_bUsingCustomTexCoords = true; diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h index b0a3995ed4..73ed39f071 100644 --- a/stepmania/src/Sprite.h +++ b/stepmania/src/Sprite.h @@ -14,8 +14,9 @@ #include "Actor.h" #include "RageUtil.h" -#include "RageTexture.h" +#include "RageTextureID.h" +class RageTexture; class Sprite: public Actor { @@ -38,7 +39,7 @@ public: virtual void SetState( int iNewState ); virtual int GetNumStates() { return m_States.size(); }; - CString GetTexturePath() { return m_pTexture==NULL ? "" : m_pTexture->GetID().filename; }; + CString GetTexturePath() const; void SetCustomTextureRect( const RectF &new_texcoord_frect ); void SetCustomTextureCoords( float fTexCoords[8] );