From 4f0bc4d43fa85c171039fe74b2c69240b79c2c8d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 15 Aug 2005 16:02:14 +0000 Subject: [PATCH] allow choosing a song on this screen, but press Start on the entry for advanced options --- stepmania/src/ScreenOptionsEditCourse.cpp | 4 +++- stepmania/src/ScreenOptionsEditCourse.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenOptionsEditCourse.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp index 9ba3334c5d..271a377149 100644 --- a/stepmania/src/ScreenOptionsEditCourse.cpp +++ b/stepmania/src/ScreenOptionsEditCourse.cpp @@ -56,6 +56,7 @@ void ScreenOptionsEditCourse::BeginScreen() ASSERT( GAMESTATE->m_pCurCourse ); Course *pCourse = GAMESTATE->m_pCurCourse; m_Original = *pCourse; + SONGMAN->GetSongs( m_vpDisplayedSongs ); vector vDefs; @@ -86,7 +87,8 @@ void ScreenOptionsEditCourse::BeginScreen() int iEntryIndex = ce - pCourse->m_vEntries.begin(); def.m_sName = ssprintf( "Entry %d", iEntryIndex+1 ); def.m_vsChoices.clear(); - def.m_vsChoices.push_back( ce->GetTextDescription() ); + FOREACH_CONST( Song*, m_vpDisplayedSongs, s ) + def.m_vsChoices.push_back( (*s)->GetTranslitFullTitle() ); vDefs.push_back( def ); vHands.push_back( NULL ); } diff --git a/stepmania/src/ScreenOptionsEditCourse.h b/stepmania/src/ScreenOptionsEditCourse.h index 50690ba123..427287ab3b 100644 --- a/stepmania/src/ScreenOptionsEditCourse.h +++ b/stepmania/src/ScreenOptionsEditCourse.h @@ -25,6 +25,8 @@ protected: int GetCourseEntryIndexWithFocus() const; Course m_Original; + + vector m_vpDisplayedSongs; // corresponds with the choices in the Entry row }; #endif