diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp index 5a635651e0..7ff6cbc1f1 100644 --- a/stepmania/src/Font.cpp +++ b/stepmania/src/Font.cpp @@ -38,7 +38,7 @@ Font::Font( const CString &sASCIITexturePath ) // load texture m_sTexturePath = sASCIITexturePath; m_sTexturePath.MakeLower(); - m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath ); + m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath, RageTexturePrefs() ); ASSERT( m_pTexture != NULL ); if( m_pTexture->GetNumFrames() != 16*16 ) throw RageException( "The font '%s' has only %d frames. All fonts must have 16*16 frames.", m_sTexturePath.GetString() ); @@ -115,7 +115,7 @@ Font::Font( const CString &sTexturePath, const CString& sCharacters ) m_sTexturePath.MakeLower(); - m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath ); + m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath, RageTexturePrefs() ); ASSERT( m_pTexture != NULL ); m_iLineSpacing = m_pTexture->GetSourceFrameHeight(); diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp index 79ea4e94d5..2b9f32a413 100644 --- a/stepmania/src/RageTextureManager.cpp +++ b/stepmania/src/RageTextureManager.cpp @@ -47,7 +47,7 @@ RageTextureManager::~RageTextureManager() //----------------------------------------------------------------------------- // Load/Unload textures from disk //----------------------------------------------------------------------------- -RageTexture* RageTextureManager::LoadTexture( CString sTexturePath ) +RageTexture* RageTextureManager::LoadTexture( CString sTexturePath, RageTexturePrefs prefs ) { sTexturePath.MakeLower(); @@ -77,7 +77,7 @@ RageTexture* RageTextureManager::LoadTexture( CString sTexturePath ) // if( sExt == "avi" || sExt == "mpg" || sExt == "mpeg" ) // pTexture = new RageMovieTexture( sTexturePath ); // else - pTexture = new RageBitmapTexture( sTexturePath, RageTexturePrefs() ); + pTexture = new RageBitmapTexture( sTexturePath, prefs ); LOG->Trace( "RageTextureManager: Finished loading '%s'.", sTexturePath.GetString() ); diff --git a/stepmania/src/RageTextureManager.h b/stepmania/src/RageTextureManager.h index 12061244b7..a930211d5e 100644 --- a/stepmania/src/RageTextureManager.h +++ b/stepmania/src/RageTextureManager.h @@ -24,7 +24,7 @@ public: RageTextureManager( int iTextureColorDepth, int iSecsBeforeUnload ); ~RageTextureManager(); - RageTexture* LoadTexture( CString sTexturePath ); + RageTexture* LoadTexture( CString sTexturePath, RageTexturePrefs prefs ); bool IsTextureLoaded( CString sTexturePath ); void UnloadTexture( CString sTexturePath ); void ReloadAll(); diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index d6cf416ae7..bb875b2e19 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -137,7 +137,7 @@ bool Sprite::LoadFromTexture( CString sTexturePath, RageTexturePrefs prefs ) m_sTexturePath = sTexturePath; - m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath ); + m_pTexture = TEXTUREMAN->LoadTexture( m_sTexturePath, prefs ); assert( m_pTexture != NULL ); // the size of the sprite is the size of the image before it was scaled