None of our themes appear to use "ShowBanner=1". If you want to do this,
load "songbanner" (or "coursebanner") in a BGAnimation.
This commit is contained in:
@@ -18,7 +18,6 @@
|
|||||||
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
|
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
|
||||||
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
|
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
|
||||||
#define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay")
|
#define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay")
|
||||||
#define SHOW_BANNER THEME->GetMetricB(m_sName,"ShowBanner")
|
|
||||||
|
|
||||||
const ScreenMessage SM_PrepScreen = (ScreenMessage)(SM_User+0);
|
const ScreenMessage SM_PrepScreen = (ScreenMessage)(SM_User+0);
|
||||||
|
|
||||||
@@ -92,18 +91,6 @@ ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName )
|
|||||||
SET_XY_AND_ON_COMMAND( m_Artist );
|
SET_XY_AND_ON_COMMAND( m_Artist );
|
||||||
SET_XY_AND_ON_COMMAND( m_SongTitle );
|
SET_XY_AND_ON_COMMAND( m_SongTitle );
|
||||||
|
|
||||||
if ( SHOW_BANNER )
|
|
||||||
{
|
|
||||||
if( GAMESTATE->m_pCurSong && GAMESTATE->m_pCurSong->HasBanner() )
|
|
||||||
{
|
|
||||||
m_Banner.LoadFromSong( GAMESTATE->m_pCurSong );
|
|
||||||
this->AddChild( &m_Banner );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m_Banner.SetName("Banner");
|
|
||||||
SET_XY( m_Banner );
|
|
||||||
ON_COMMAND(m_Banner);
|
|
||||||
|
|
||||||
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) );
|
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+GAMESTATE->GetStageText()) );
|
||||||
|
|
||||||
this->SortByDrawOrder();
|
this->SortByDrawOrder();
|
||||||
@@ -128,7 +115,6 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
OFF_COMMAND( m_sprCharacterIcon[p] );
|
OFF_COMMAND( m_sprCharacterIcon[p] );
|
||||||
OFF_COMMAND( m_SongTitle );
|
OFF_COMMAND( m_SongTitle );
|
||||||
OFF_COMMAND( m_Artist );
|
OFF_COMMAND( m_Artist );
|
||||||
OFF_COMMAND( m_Banner );
|
|
||||||
OFF_COMMAND( m_Background );
|
OFF_COMMAND( m_Background );
|
||||||
this->PostScreenMessage( SM_GoToNextScreen, this->GetTweenTimeLeft() );
|
this->PostScreenMessage( SM_GoToNextScreen, this->GetTweenTimeLeft() );
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "Character.h"
|
#include "Character.h"
|
||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "Banner.h"
|
|
||||||
|
|
||||||
class ScreenStage : public Screen
|
class ScreenStage : public Screen
|
||||||
{
|
{
|
||||||
@@ -23,7 +22,6 @@ private:
|
|||||||
Transition m_In, m_Out, m_Back;
|
Transition m_In, m_Out, m_Back;
|
||||||
BGAnimation m_Background;
|
BGAnimation m_Background;
|
||||||
BGAnimation m_Overlay; // overlays all elements except bitmaptexts
|
BGAnimation m_Overlay; // overlays all elements except bitmaptexts
|
||||||
Banner m_Banner;
|
|
||||||
BitmapText m_SongTitle;
|
BitmapText m_SongTitle;
|
||||||
BitmapText m_Artist;
|
BitmapText m_Artist;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user