From 8f1680b8da74a3320c08038d81309a074ab324f5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 25 Jan 2004 16:49:05 +0000 Subject: [PATCH] use ModeChoice --- stepmania/src/ScreenSelect.cpp | 5 +++++ stepmania/src/ScreenSelect.h | 1 + 2 files changed, 6 insertions(+) diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 1440b8e790..18eb8294d9 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -17,6 +17,7 @@ #include "RageSounds.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" +#include "SongManager.h" #include "GameManager.h" #include "RageLog.h" #include "AnnouncerManager.h" @@ -69,6 +70,9 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName) m_aCodes.push_back( code ); m_aCodeActions.push_back( CODE_ACTION(c) ); + ModeChoice mc; + mc.Load( c, CODE_ACTION(c) ); + m_aCodeChoices.push_back( mc ); } } @@ -144,6 +148,7 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type, SOUND->PlayOnce( THEME->GetPathToS( asBits[1] ) ); } + m_aCodeChoices[i].Apply( MenuI.player ); } Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default input handler } diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h index af4219298e..b74ce0bc05 100644 --- a/stepmania/src/ScreenSelect.h +++ b/stepmania/src/ScreenSelect.h @@ -46,6 +46,7 @@ protected: vector m_aModeChoices; // derived classes should look here for what choices are available vector m_aCodes; + vector m_aCodeChoices; vector m_aCodeActions; };