diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index ce1433093e..d4276bc427 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -136,7 +136,7 @@ protected: bool IsLastSong(); void SetupSong( int iSongIndex ); void ReloadCurrentSong(); - void LoadNextSong(); + virtual void LoadNextSong(); void LoadCourseSongNumber( int SongNumber ); float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic); void LoadLights(); diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp index ccc7347ab5..8cae8a2fe0 100644 --- a/stepmania/src/ScreenGameplayMultiplayer.cpp +++ b/stepmania/src/ScreenGameplayMultiplayer.cpp @@ -1,5 +1,6 @@ #include "global.h" #include "ScreenGameplayMultiplayer.h" +#include "GameState.h" REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer ); @@ -23,7 +24,17 @@ void ScreenGameplayMultiplayer::FillPlayerInfo( vector &vPlayerInfoO pi.LoadDummyP1(); // dummy autoplay NoteField }; -// lua end +void ScreenGameplayMultiplayer::LoadNextSong() +{ + ScreenGameplay::LoadNextSong(); + + ASSERT( !m_vPlayerInfo.empty() ); + int iIndex = m_vPlayerInfo.size()-1; + PlayerInfo &pi = m_vPlayerInfo[iIndex]; + //pi.LoadDummyP1(); // dummy autoplay NoteField + pi.m_PlayerStateDummy = *GAMESTATE->m_pPlayerState[PLAYER_1]; +} + /* * (c) 2005 Chris Danford diff --git a/stepmania/src/ScreenGameplayMultiplayer.h b/stepmania/src/ScreenGameplayMultiplayer.h index 172cfc726d..39cfcad178 100644 --- a/stepmania/src/ScreenGameplayMultiplayer.h +++ b/stepmania/src/ScreenGameplayMultiplayer.h @@ -12,6 +12,7 @@ public: ScreenGameplayMultiplayer( CString sName ); void Init(); virtual void FillPlayerInfo( vector &vPlayerInfoOut ); + virtual void ScreenGameplayMultiplayer::LoadNextSong(); };