diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index e420356136..813c142b77 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -63,7 +63,7 @@ Background::Background() m_BackgroundMode = MODE_STATIC_BG; - m_BGADanger.LoadFromAniDir( THEME->GetPathTo("BGAnimations","danger") ); + m_BGADanger.LoadFromAniDir( THEME->GetPathTo("BGAnimations","gameplay danger") ); m_quadBGBrightness.StretchTo( RECT_BACKGROUND ); m_quadBGBrightness.SetDiffuse( D3DXCOLOR(0,0,0,1-PREFSMAN->m_fBGBrightness) ); diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp index 35f963b2b1..c0a07fd3a9 100644 --- a/stepmania/src/RageBitmapTexture.cpp +++ b/stepmania/src/RageBitmapTexture.cpp @@ -112,7 +112,7 @@ void RageBitmapTexture::Create( ///////////////////// - // Figure out whether the texture can fit into texture memory unscaled + // Get info about the bitmap ///////////////////// D3DXIMAGE_INFO ddii; if( FAILED( hr = D3DXGetImageInfoFromFile(m_sFilePath,&ddii) ) ) diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 2c036af4f1..ecba0db945 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -81,11 +81,16 @@ bool Sprite::LoadFromSpriteFile( CString sSpritePath, bool bForceReload, int iMi CString sTextureFile; ini.GetValue( "Sprite", "Texture", sTextureFile ); - if( sTextureFile == "" ) + if( sTextureFile == "" ) throw RageException( "Error reading value 'Texture' from %s.", m_sSpritePath ); CString sTexturePath = sFontDir + sTextureFile; // save the path of the new texture + if( !DoesFileExist(sTexturePath) ) + throw RageException( "The sprite file '%s' points to a texture '%s' which doesn't exist.", m_sSpritePath, sTexturePath ); + + + // Load the texture if( !LoadTexture( sTexturePath ) ) return FALSE;