From 195cd01db56bde99b40bfee5f6bc92fe070f1c68 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 13 Mar 2003 08:47:43 +0000 Subject: [PATCH] Fix playback in editor (start the music - duh!) Fix AutoPlay text showing in Demo, Jukebox --- stepmania/src/ScreenEdit.cpp | 1 + stepmania/src/ScreenGameplay.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 471e57a4d6..2782c72739 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1324,6 +1324,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers ) LOG->Trace( "Starting playback at %f", fStartSeconds ); m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate ); m_soundMusic.SetPositionSeconds( fStartSeconds ); + m_soundMusic.StartPlaying(); } break; case record: diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index b29d9bd392..285915932f 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -399,7 +399,8 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration ) m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","header2") ); m_textAutoPlay.SetXY( AUTOPLAY_X, AUTOPLAY_Y ); - this->AddChild( &m_textAutoPlay ); + if( !bDemonstration ) // only load if we're not in demonstration of jukebox + this->AddChild( &m_textAutoPlay ); UpdateAutoPlayText();