actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error output, simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-03-05 09:51:32 +00:00
parent 4f120731aa
commit f5116967a8
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+23 -19
View File
@@ -576,27 +576,31 @@ void Song::TidyUpData()
continue; // skip
SDL_Surface *img = IMG_Load( m_sSongDir + arrayImages[i] );
if( img )
if( !img )
{
int width = img->w;
int height = img->h;
SDL_FreeSurface( img );
LOG->Trace("Couldn't load %s%s: %s",
m_sSongDir.GetString(), arrayImages[i].GetString(), SDL_GetError());
continue;
}
if( !HasBackground() && width >= 320 && height >= 240 )
{
m_sBackgroundFile = arrayImages[i];
continue;
}
if( !HasBanner() && 100<=width && width<=320 && 50<=height && height<=240 )
{
m_sBannerFile = arrayImages[i];
continue;
}
if( !HasCDTitle() && width<=100 && height<=50 )
{
m_sCDTitleFile = arrayImages[i];
continue;
}
const int width = img->w;
const int height = img->h;
SDL_FreeSurface( img );
if( !HasBackground() && width >= 320 && height >= 240 )
{
m_sBackgroundFile = arrayImages[i];
continue;
}
if( !HasBanner() && 100<=width && width<=320 && 50<=height && height<=240 )
{
m_sBannerFile = arrayImages[i];
continue;
}
if( !HasCDTitle() && width<=100 && height<=50 )
{
m_sCDTitleFile = arrayImages[i];
continue;
}
}