From e3e09178201e4066cf96ba5fa54a762eac1187e0 Mon Sep 17 00:00:00 2001 From: Nickito12 Date: Sun, 29 Jan 2017 12:57:29 -0300 Subject: [PATCH] Update ScreenNetSelectMusic.cpp --- src/ScreenNetSelectMusic.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ScreenNetSelectMusic.cpp b/src/ScreenNetSelectMusic.cpp index ff826e6e64..811bfa2f1c 100644 --- a/src/ScreenNetSelectMusic.cpp +++ b/src/ScreenNetSelectMusic.cpp @@ -491,34 +491,38 @@ bool ScreenNetSelectMusic::MenuDown( const InputEventPlus &input ) bool ScreenNetSelectMusic::MenuStart( const InputEventPlus &input ) { + return SelectCurrent(); +} +bool ScreenNetSelectMusic::SelectCurrent() +{ + bool bResult = m_MusicWheel.Select(); - if( !bResult ) + if (!bResult) return true; - if( m_MusicWheel.GetSelectedType() != WheelItemDataType_Song ) + if (m_MusicWheel.GetSelectedType() != WheelItemDataType_Song) return true; Song * pSong = m_MusicWheel.GetSelectedSong(); - if( pSong == NULL ) + if (pSong == NULL) return false; - GAMESTATE->m_pCurSong.Set( pSong ); + GAMESTATE->m_pCurSong.Set(pSong); - if( NSMAN->useSMserver ) + if (NSMAN->useSMserver) { NSMAN->m_sArtist = pSong->GetTranslitArtist(); NSMAN->m_sMainTitle = pSong->GetTranslitMainTitle(); NSMAN->m_sSubTitle = pSong->GetTranslitSubTitle(); NSMAN->m_iSelectMode = 2; // Command for user selecting song - NSMAN->SelectUserSong (); + NSMAN->SelectUserSong(); } else StartSelectedSong(); return true; } - bool ScreenNetSelectMusic::MenuBack( const InputEventPlus &input ) { SOUND->StopMusic(); @@ -690,10 +694,14 @@ class LunaScreenNetSelectMusic : public Luna p->GetMusicWheel()->PushSelf(L); return 1; } + static int SelectCurrent(T* p, lua_State *L) { + p->SelectCurrent(); + return 1; + } LunaScreenNetSelectMusic() { ADD_METHOD(GetMusicWheel); - } + ADD_METHOD(SelectCurrent); }; LUA_REGISTER_DERIVED_CLASS(ScreenNetSelectMusic, ScreenNetSelectBase)