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

simplify, fix fallback, fix lights transform not being run

Browse Source
This commit is contained in:
Glenn Maynard
2004-07-17 20:17:25 +00:00
parent b7799ccd0a
commit 093b507d25
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+15 -25
View File
@@ -1026,35 +1026,25 @@ void ScreenGameplay::LoadNextSong()
// Load cabinet lights data
//
{
vector<Steps*> vSteps;
m_CabinetLightsNoteData.Init();
ASSERT( GAMESTATE->m_pCurSong );
// From what I understood, if there is no pre-defined step set for lights, then we fall-back
// onto the specified difficulty's stepchart, flashing all cabinet lights on each tap note.
// -- Miryokuteki
// Steps *pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( STEPS_TYPE_LIGHTS_CABINET, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
vSteps = GAMESTATE->m_pCurSong->GetAllSteps( STEPS_TYPE_LIGHTS_CABINET);
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) );
}
}
//If there are no light steps do this (to get current style's steps
if (vSteps.empty())
GAMESTATE->m_pCurSong->GetSteps(vSteps,
GAMESTATE->GetCurrentStyle()->m_StepsType);
//Obtain the default steps (just in case the desired difficulty does not exist)
if(!vSteps.empty())
vSteps[0]->GetNoteData(&m_CabinetLightsNoteData);
//Scan through all available steps, to see if any match our desired difficulty
for (unsigned i = 0; i < vSteps.size(); ++i)
if (StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) ==
vSteps[i]->GetDifficulty())
vSteps[i]->GetNoteData( &m_CabinetLightsNoteData );
//if( pSteps != NULL )
// pSteps->GetNoteData( &m_CabinetLightsNoteData );
// Convert to 4s so that we can check if we're inside a hold with just
// GetTapNote().
m_CabinetLightsNoteData.ConvertHoldNotesTo4s();
stepmania/src/Song.cpp
+3
View File
@@ -1093,6 +1093,9 @@ void Song::AddAutoGenNotes()
/* If m_bAutogenSteps is disabled, only autogen lights. */
if( !PREFSMAN->m_bAutogenSteps && stMissing != STEPS_TYPE_LIGHTS_CABINET )
continue;
/* XXX: disable lights autogen for now */
if( stMissing == STEPS_TYPE_LIGHTS_CABINET )
continue;
// missing Steps of this type
int iNumTracksOfMissing = GAMEMAN->StepsTypeToNumTracks(stMissing);