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

Merge pull request #244 from sigatrev/TapNote-enums

Browse Source 
Enums for TapNoteType, TapNoteSubType, and TapNoteSource
This commit is contained in:
kyzentun
2014-07-30 23:03:51 -06:00
parent 97bcfb37de e81af8c131
commit d7fade2f0b
28 changed files with 462 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenGameplay.cpp
+5 -5
View File
@@ -1017,14 +1017,14 @@ void ScreenGameplay::SetupSong( int iSongIndex )
// load player
{
pi->m_NoteData = ndTransformed;
NoteDataUtil::RemoveAllTapsOfType( pi->m_NoteData, TapNote::autoKeysound );
NoteDataUtil::RemoveAllTapsOfType( pi->m_NoteData, TapNoteType_AutoKeysound );
pi->m_pPlayer->Load();
}
// load auto keysounds
{
NoteData nd = ndTransformed;
NoteDataUtil::RemoveAllTapsExceptForType( nd, TapNote::autoKeysound );
NoteDataUtil::RemoveAllTapsExceptForType( nd, TapNoteType_AutoKeysound );
m_AutoKeysounds.Load( pi->GetStepsAndTrailIndex(), nd );
}
@@ -2057,7 +2057,7 @@ void ScreenGameplay::UpdateLights()
// for each index we crossed since the last update:
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( m_CabinetLightsNoteData, cl, r, iRowLastCrossed+1, iSongRow+1 )
{
if( m_CabinetLightsNoteData.GetTapNote( cl, r ).type != TapNote::empty )
if( m_CabinetLightsNoteData.GetTapNote( cl, r ).type != TapNoteType_Empty )
bBlinkCabinetLight[cl] = true;
}
@@ -2076,7 +2076,7 @@ void ScreenGameplay::UpdateLights()
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( nd, t, r, iRowLastCrossed+1, iSongRow+1 )
{
const TapNote &tn = nd.GetTapNote( t, r );
if( tn.type != TapNote::mine )
if( tn.type != TapNoteType_Mine )
bBlink = true;
}
@@ -2173,7 +2173,7 @@ void ScreenGameplay::SendCrossedMessages()
int iNumTracksWithTapOrHoldHead = 0;
for( int t=0; t<nd.GetNumTracks(); t++ )
{
if( nd.GetTapNote(t,r).type == TapNote::empty )
if( nd.GetTapNote(t,r).type == TapNoteType_Empty )
continue;
iNumTracksWithTapOrHoldHead++;