From 97fb44e1833d6cb273b0b84169c6d35b28ebb67c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 11 Sep 2005 03:14:06 +0000 Subject: [PATCH] reduce dependency on m_Type --- stepmania/src/ScreenEvaluation.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index b0fcb750aa..e047981a0f 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -272,8 +272,12 @@ void ScreenEvaluation::Init() switch( m_Type ) { case stage: + case course: { - m_LargeBanner.LoadFromSong( GAMESTATE->m_pCurSong ); + if( GAMESTATE->IsCourseMode() ) + m_LargeBanner.LoadFromCourse( GAMESTATE->m_pCurCourse ); + else + m_LargeBanner.LoadFromSong( GAMESTATE->m_pCurSong ); m_LargeBanner.ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); m_LargeBanner.SetName( "LargeBanner" ); SET_XY_AND_ON_COMMAND( m_LargeBanner ); @@ -304,20 +308,6 @@ void ScreenEvaluation::Init() } } break; - case course: - { - m_LargeBanner.LoadFromCourse( GAMESTATE->m_pCurCourse ); - m_LargeBanner.ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); - m_LargeBanner.SetName( "LargeBanner" ); - SET_XY_AND_ON_COMMAND( m_LargeBanner ); - this->AddChild( &m_LargeBanner ); - - m_sprLargeBannerFrame.Load( THEME->GetPathG(m_sName,"banner frame") ); - m_sprLargeBannerFrame->SetName( "LargeBannerFrame" ); - SET_XY_AND_ON_COMMAND( m_sprLargeBannerFrame ); - this->AddChild( m_sprLargeBannerFrame ); - } - break; default: ASSERT(0); }