actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

split out ScreenGameplay::LoadLights

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-04 06:48:34 +00:00
parent 3ba7b814c7
commit 87af9cf1f1
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+26 -21
View File
@@ -1081,27 +1081,7 @@ void ScreenGameplay::LoadNextSong()
// //
// Load cabinet lights data // Load cabinet lights data
// //
if( LIGHTSMAN->IsEnabled() ) LoadLights();
{
m_CabinetLightsNoteData.Init();
ASSERT( GAMESTATE->m_pCurSong );
Steps *pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( STEPS_TYPE_LIGHTS_CABINET, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
if( pSteps != NULL )
{
pSteps->GetNoteData( m_CabinetLightsNoteData );
}
else
{
pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( GAMESTATE->GetCurrentStyle()->m_StepsType, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
if( pSteps )
{
NoteData TapNoteData;
pSteps->GetNoteData( TapNoteData );
NoteDataUtil::LoadTransformedLights( TapNoteData, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) );
}
}
}
/* Load the music last, since it may start streaming and we don't want the music /* Load the music last, since it may start streaming and we don't want the music
* to compete with other loading. */ * to compete with other loading. */
@@ -1109,6 +1089,31 @@ void ScreenGameplay::LoadNextSong()
m_pSoundMusic = m_AutoKeysounds.GetSound(); m_pSoundMusic = m_AutoKeysounds.GetSound();
} }
void ScreenGameplay::LoadLights()
{
if( !LIGHTSMAN->IsEnabled() )
return;
m_CabinetLightsNoteData.Init();
ASSERT( GAMESTATE->m_pCurSong );
Steps *pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( STEPS_TYPE_LIGHTS_CABINET, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
if( pSteps != NULL )
{
pSteps->GetNoteData( m_CabinetLightsNoteData );
}
else
{
pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( GAMESTATE->GetCurrentStyle()->m_StepsType, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
if( pSteps )
{
NoteData TapNoteData;
pSteps->GetNoteData( TapNoteData );
NoteDataUtil::LoadTransformedLights( TapNoteData, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) );
}
}
}
float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic) float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic)
{ {
ASSERT(MinTimeToNotes >= 0); ASSERT(MinTimeToNotes >= 0);
stepmania/src/ScreenGameplay.h
+1
View File
@@ -64,6 +64,7 @@ protected:
void LoadNextSong(); void LoadNextSong();
void LoadCourseSongNumber( int SongNumber ); void LoadCourseSongNumber( int SongNumber );
float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic); float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic);
void LoadLights();
void PauseGame( bool bPause, GameController gc = GAME_CONTROLLER_INVALID ); void PauseGame( bool bPause, GameController gc = GAME_CONTROLLER_INVALID );
void ShowSavePrompt( ScreenMessage SM_SendWhenDone ); void ShowSavePrompt( ScreenMessage SM_SendWhenDone );
void PlayAnnouncer( CString type, float fSeconds ); void PlayAnnouncer( CString type, float fSeconds );