remove m_bgCondBga; none of our themes seem to use it. (If anyone
needed this, post to sm-devs saying what you need to do any I'll explain how to do it with the newer XML-based system.)
This commit is contained in:
@@ -300,8 +300,6 @@ void ScreenEvaluation::Init()
|
|||||||
m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") );
|
m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") );
|
||||||
m_sndPassFail.Play();
|
m_sndPassFail.Play();
|
||||||
|
|
||||||
m_bgCondBga.Load(m_sName);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// load other sounds
|
// load other sounds
|
||||||
//
|
//
|
||||||
@@ -1270,7 +1268,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
|
|||||||
{
|
{
|
||||||
ScreenWithMenuElements::Update( fDeltaTime );
|
ScreenWithMenuElements::Update( fDeltaTime );
|
||||||
|
|
||||||
m_bgCondBga.Update(fDeltaTime);
|
|
||||||
if( !m_bPassFailTriggered )
|
if( !m_bPassFailTriggered )
|
||||||
{
|
{
|
||||||
float fTime = m_bFailed? FAILED_SOUND_TIME:PASSED_SOUND_TIME;
|
float fTime = m_bFailed? FAILED_SOUND_TIME:PASSED_SOUND_TIME;
|
||||||
@@ -1321,8 +1318,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
|
|||||||
|
|
||||||
void ScreenEvaluation::DrawPrimitives()
|
void ScreenEvaluation::DrawPrimitives()
|
||||||
{
|
{
|
||||||
m_bgCondBga.DrawPrimitives();
|
|
||||||
|
|
||||||
Screen::DrawPrimitives();
|
Screen::DrawPrimitives();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "GraphDisplay.h"
|
#include "GraphDisplay.h"
|
||||||
#include "ComboGraph.h"
|
#include "ComboGraph.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "ConditionalBGA.h"
|
|
||||||
#include "HighScore.h"
|
#include "HighScore.h"
|
||||||
#include "RageSound.h"
|
#include "RageSound.h"
|
||||||
|
|
||||||
@@ -63,8 +62,6 @@ protected:
|
|||||||
|
|
||||||
float m_fScreenCreateTime;
|
float m_fScreenCreateTime;
|
||||||
|
|
||||||
ConditionalBGA m_bgCondBga;
|
|
||||||
|
|
||||||
// banner area
|
// banner area
|
||||||
Banner m_LargeBanner;
|
Banner m_LargeBanner;
|
||||||
AutoActor m_sprLargeBannerFrame;
|
AutoActor m_sprLargeBannerFrame;
|
||||||
|
|||||||
Reference in New Issue
Block a user