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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-08-30 00:15:21 +00:00
parent c67bfb2624
commit 9542c08516
1 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+10 -29
View File
@@ -10,13 +10,13 @@
#include "RageLog.h" #include "RageLog.h"
#include "song.h" #include "song.h"
#include "GameState.h" #include "GameState.h"
#include "RageTextureManager.h"
#include "Course.h" #include "Course.h"
#include "XmlFile.h" #include "XmlFile.h"
#include "FontCharAliases.h" #include "FontCharAliases.h"
#include "LuaManager.h" #include "LuaManager.h"
#include "MessageManager.h" #include "MessageManager.h"
#include "Foreach.h" #include "Foreach.h"
#include "Banner.h"
#include "arch/Dialog/Dialog.h" #include "arch/Dialog/Dialog.h"
@@ -178,7 +178,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sDir, const XNode* pNode )
{ {
if( sFile == "" ) if( sFile == "" )
{ {
CString sError = ssprintf( "The actor file in '%s' is as a blank, invalid File attribute \"%s\"", CString sError = ssprintf( "The actor file in '%s' has a blank, invalid File attribute \"%s\"",
sDir.c_str(), sClass.c_str() ); sDir.c_str(), sClass.c_str() );
RageException::Throw( sError ); RageException::Throw( sError );
} }
@@ -221,36 +221,17 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sDir, const XNode* pNode )
} }
else if( sClass == "SongBanner" ) else if( sClass == "SongBanner" )
{ {
Song *pSong = GAMESTATE->m_pCurSong; Banner *pBanner = new Banner;
if( pSong && pSong->HasBanner() ) pBanner->LoadFromSong( GAMESTATE->m_pCurSong );
sFile = pSong->GetBannerPath(); pBanner->LoadFromNode( sDir, pNode );
else pReturn = pBanner;
sFile = THEME->GetPathG("Common","fallback banner");
TEXTUREMAN->DisableOddDimensionWarning();
/* 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) );
pSprite->LoadFromNode( sDir, pNode );
TEXTUREMAN->EnableOddDimensionWarning();
pReturn = pSprite;
} }
else if( sClass == "CourseBanner" ) else if( sClass == "CourseBanner" )
{ {
Course *pCourse = GAMESTATE->m_pCurCourse; Banner *pBanner = new Banner;
if( pCourse && pCourse->HasBanner() ) pBanner->LoadFromCourse( GAMESTATE->m_pCurCourse );
sFile = pCourse->m_sBannerPath; pBanner->LoadFromNode( sDir, pNode );
else pReturn = pBanner;
sFile = THEME->GetPathG("Common","fallback banner");
TEXTUREMAN->DisableOddDimensionWarning();
Sprite* pSprite = new Sprite;
pSprite->Load( Sprite::SongBannerTexture(sFile) );
pSprite->LoadFromNode( sDir, pNode );
TEXTUREMAN->EnableOddDimensionWarning();
pReturn = pSprite;
} }
else // sClass is empty or garbage (e.g. "1" // 0==Sprite") else // sClass is empty or garbage (e.g. "1" // 0==Sprite")
{ {