Bring shadowed variables back from the dark side.

Alright Colby, happy now?
This commit is contained in:
Jason Felds
2011-03-14 02:54:11 -04:00
parent d855d8c7e8
commit e9df4832f6
14 changed files with 62 additions and 64 deletions
+6 -6
View File
@@ -1376,9 +1376,9 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
// Don't play start sound. We play it again below on finalized
//m_soundStart.Play();
Message msg("StepsChosen");
msg.SetParam( "Player", p );
MESSAGEMAN->Broadcast( msg );
Message lMsg("StepsChosen");
lMsg.SetParam( "Player", p );
MESSAGEMAN->Broadcast( lMsg );
}
}
@@ -1781,19 +1781,19 @@ void ScreenSelectMusic::AfterMusicChange()
case TYPE_COURSE:
{
const Course *pCourse = m_MusicWheel.GetSelectedCourse();
const Course *lCourse = m_MusicWheel.GetSelectedCourse();
const Style *pStyle = NULL;
if( CommonMetrics::AUTO_SET_STYLE )
pStyle = pCourse->GetCourseStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined() );
if( pStyle == NULL )
pStyle = GAMESTATE->GetCurrentStyle();
pCourse->GetTrails( m_vpTrails, pStyle->m_StepsType );
lCourse->GetTrails( m_vpTrails, pStyle->m_StepsType );
m_sSampleMusicToPlay = m_sCourseMusicPath;
m_fSampleStartSeconds = 0;
m_fSampleLengthSeconds = -1;
g_sBannerPath = pCourse->GetBannerPath();
g_sBannerPath = lCourse->GetBannerPath();
if( g_sBannerPath.empty() )
m_Banner.LoadFallback();