diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 2942baf7e5..409ba71ea4 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -19,6 +19,9 @@ sm-ssc v1.2 | 201012xx * [ScreenNetSelectMusic] StepsDisplay changed to load from StepsDisplayNet. [freem] * [RoomWheelItem] Added OverPart (just like in MusicWheelItem). [freem] * [SongManager] Added GetSongRank(Song) Lua binding. [freem] +* Changed Steps picking logic in ScreenGameplaySyncMachine; now playable Steps + are chosen, instead of whatever NoteData happens to be first. + Also added pump-single data to ScreenGameplaySyncMachine music.sm. [freem] 20101225 -------- diff --git a/Themes/_fallback/Other/ScreenGameplaySyncMachine music.sm b/Themes/_fallback/Other/ScreenGameplaySyncMachine music.sm index 04761e58f0..4e31da0de3 100644 --- a/Themes/_fallback/Other/ScreenGameplaySyncMachine music.sm +++ b/Themes/_fallback/Other/ScreenGameplaySyncMachine music.sm @@ -96,3 +96,80 @@ 1000 0001 ; + +//---------------dance-single - blank---------------- +#NOTES: + pump-single: + blank: + Beginner: + 1: + 0.302,0.205,0.000,0.000,0.000: + // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 3 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 4 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 5 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 6 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 7 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 8 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +; diff --git a/Themes/default/Other/ScreenGameplaySyncMachine music.sm b/Themes/default/Other/ScreenGameplaySyncMachine music.sm index 04761e58f0..4e31da0de3 100644 --- a/Themes/default/Other/ScreenGameplaySyncMachine music.sm +++ b/Themes/default/Other/ScreenGameplaySyncMachine music.sm @@ -96,3 +96,80 @@ 1000 0001 ; + +//---------------dance-single - blank---------------- +#NOTES: + pump-single: + blank: + Beginner: + 1: + 0.302,0.205,0.000,0.000,0.000: + // measure 1 +00000 +00000 +00000 +00000 +, // measure 2 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 3 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 4 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 5 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 6 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 7 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +, // measure 8 +10000 +00001 +10000 +00001 +10000 +00001 +10000 +00001 +; diff --git a/src/ScreenGameplaySyncMachine.cpp b/src/ScreenGameplaySyncMachine.cpp index eecdbc7eef..ed6bee0814 100644 --- a/src/ScreenGameplaySyncMachine.cpp +++ b/src/ScreenGameplaySyncMachine.cpp @@ -24,8 +24,11 @@ void ScreenGameplaySyncMachine::Init() m_Song.TidyUpData(); GAMESTATE->m_pCurSong.Set( &m_Song ); - Steps *pSteps = SongUtil::GetOneSteps( &m_Song ); - ASSERT( pSteps ); + // needs proper StepsType - freem + vector vpSteps; + SongUtil::GetPlayableSteps( &m_Song, vpSteps ); + ASSERT(vpSteps.size() > 0); + Steps *pSteps = vpSteps[0]; GAMESTATE->m_pCurSteps[0].Set( pSteps ); GamePreferences::m_AutoPlay.Set( PC_HUMAN );