Moving more constants into theme metrics.

This commit is contained in:
Chris Danford
2002-08-27 16:53:25 +00:00
parent 142002091a
commit 941d9cb24d
33 changed files with 245 additions and 161 deletions
+6 -2
View File
@@ -142,7 +142,7 @@ ScreenSelectMusic::ScreenSelectMusic()
m_Menu.Load(
THEME->GetPathTo("Graphics","select music background"),
THEME->GetPathTo("Graphics","select music top edge"),
HELP_TEXT, false, true, TIMER_SECONDS
HELP_TEXT, true, TIMER_SECONDS
);
this->AddSubActor( &m_Menu );
@@ -825,7 +825,11 @@ void ScreenSelectMusic::PlayMusicSample()
Song* pSong = m_MusicWheel.GetSelectedSong();
if( pSong )
MUSIC->LoadAndPlayIfNotAlready( pSong->GetMusicPath() );
{
MUSIC->Stop();
MUSIC->Load( pSong->GetMusicPath() );
MUSIC->Play( true, pSong->m_fMusicSampleStartSeconds, pSong->m_fMusicSampleLengthSeconds );
}
else
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select music music") );
}