hack to fix dummy player having invalid NoteSkin when switching between course songs

This commit is contained in:
Chris Danford
2006-01-10 21:40:29 +00:00
parent da817bf62c
commit 5902eee342
3 changed files with 14 additions and 2 deletions
+1 -1
View File
@@ -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();
+12 -1
View File
@@ -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<PlayerInfo> &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
@@ -12,6 +12,7 @@ public:
ScreenGameplayMultiplayer( CString sName );
void Init();
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
virtual void ScreenGameplayMultiplayer::LoadNextSong();
};