add char icons to SelectCharacter screen
This commit is contained in:
@@ -18,6 +18,8 @@
|
|||||||
#include "song.h"
|
#include "song.h"
|
||||||
#include "RageTextureManager.h"
|
#include "RageTextureManager.h"
|
||||||
#include "Course.h"
|
#include "Course.h"
|
||||||
|
#include "Character.h"
|
||||||
|
|
||||||
|
|
||||||
RageTextureID Banner::BannerTex( RageTextureID ID )
|
RageTextureID Banner::BannerTex( RageTextureID ID )
|
||||||
{
|
{
|
||||||
@@ -118,6 +120,27 @@ void Banner::LoadFromCourse( Course* pCourse ) // NULL means no course
|
|||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Banner::LoadCardFromCharacter( Character* pCharacter )
|
||||||
|
{
|
||||||
|
ASSERT( pCharacter );
|
||||||
|
|
||||||
|
if( pCharacter->GetCardPath() != "" ) Load( pCharacter->GetCardPath() );
|
||||||
|
else LoadFallback();
|
||||||
|
|
||||||
|
m_bScrolling = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Banner::LoadIconFromCharacter( Character* pCharacter )
|
||||||
|
{
|
||||||
|
ASSERT( pCharacter );
|
||||||
|
|
||||||
|
if( pCharacter->GetIconPath() != "" ) Load( pCharacter->GetIconPath() );
|
||||||
|
else if( pCharacter->GetCardPath() != "" ) Load( pCharacter->GetCardPath() );
|
||||||
|
else LoadFallback();
|
||||||
|
|
||||||
|
m_bScrolling = false;
|
||||||
|
}
|
||||||
|
|
||||||
void Banner::LoadFallback()
|
void Banner::LoadFallback()
|
||||||
{
|
{
|
||||||
Load( THEME->GetPathToG("Common fallback banner") );
|
Load( THEME->GetPathToG("Common fallback banner") );
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#include "RageTexture.h"
|
#include "RageTexture.h"
|
||||||
class Song;
|
class Song;
|
||||||
class Course;
|
class Course;
|
||||||
|
class Character;
|
||||||
|
|
||||||
class Banner : public Sprite
|
class Banner : public Sprite
|
||||||
{
|
{
|
||||||
@@ -31,6 +31,8 @@ public:
|
|||||||
void LoadAllMusic();
|
void LoadAllMusic();
|
||||||
void LoadFromGroup( CString sGroupName );
|
void LoadFromGroup( CString sGroupName );
|
||||||
void LoadFromCourse( Course* pCourse );
|
void LoadFromCourse( Course* pCourse );
|
||||||
|
void LoadCardFromCharacter( Character* pCharacter );
|
||||||
|
void LoadIconFromCharacter( Character* pCharacter );
|
||||||
void LoadRoulette();
|
void LoadRoulette();
|
||||||
void LoadRandom();
|
void LoadRandom();
|
||||||
void LoadFallback();
|
void LoadFallback();
|
||||||
|
|||||||
Reference in New Issue
Block a user