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

fix duplicate banner load

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-26 08:08:02 +00:00
parent e3d7949a9d
commit 1d92cd087f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+13 -4
View File
@@ -99,9 +99,9 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
else else
sFile = THEME->GetPathToG("Common fallback background"); sFile = THEME->GetPathToG("Common fallback background");
/* Always load song backgrounds with LoadBG. It sets texture properties; /* Always load song backgrounds with SongBGTexture. It sets texture properties;
* if we load a background without setting those properties, we'll end up * if we load a background without setting those properties, we'll end up
* with duplicate loads. */ * with duplicates. */
Sprite* pSprite = new Sprite; Sprite* pSprite = new Sprite;
pSprite->LoadBG( sFile ); pSprite->LoadBG( sFile );
pActor = pSprite; pActor = pSprite;
@@ -118,7 +118,14 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
sFile = THEME->GetPathToG("Common fallback banner"); sFile = THEME->GetPathToG("Common fallback banner");
TEXTUREMAN->DisableOddDimensionWarning(); TEXTUREMAN->DisableOddDimensionWarning();
pActor = MakeActor( sFile );
/* Always load banners with BannerTex. It sets texture properties;
* if we load a background without setting those properties, we'll end up
* with duplicates. */
Sprite* pSprite = new Sprite;
pSprite->Load( Sprite::SongBannerTexture(sFile) );
pActor = pSprite;
TEXTUREMAN->EnableOddDimensionWarning(); TEXTUREMAN->EnableOddDimensionWarning();
} }
else if( sFile.CompareNoCase("coursebanner")==0 ) else if( sFile.CompareNoCase("coursebanner")==0 )
@@ -133,7 +140,9 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
sFile = THEME->GetPathToG("Common fallback banner"); sFile = THEME->GetPathToG("Common fallback banner");
TEXTUREMAN->DisableOddDimensionWarning(); TEXTUREMAN->DisableOddDimensionWarning();
pActor = MakeActor( sFile ); Sprite* pSprite = new Sprite;
pSprite->Load( Sprite::SongBannerTexture(sFile) );
pActor = pSprite;
TEXTUREMAN->EnableOddDimensionWarning(); TEXTUREMAN->EnableOddDimensionWarning();
} }
else if( IsAFile(sDir+sFile) || IsADirectory(sDir+sFile) ) else if( IsAFile(sDir+sFile) || IsADirectory(sDir+sFile) )