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

Pass timing data to TransformNoteData so that fake notes inside warps can be removed properly.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2016-03-02 08:23:26 -07:00
parent c50ad2286c
commit eb3121faf9
5 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+5 -5
View File
@@ -670,13 +670,13 @@ void Player::Load()
// if( m_pScore )
// m_pScore->Init( pn );
m_Timing = GAMESTATE->m_pCurSteps[pn]->GetTimingData();
/* Apply transforms. */
NoteDataUtil::TransformNoteData( m_NoteData, m_pPlayerState->m_PlayerOptions.GetStage(), GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)->m_StepsType );
NoteDataUtil::TransformNoteData(m_NoteData, *m_Timing, m_pPlayerState->m_PlayerOptions.GetStage(), GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)->m_StepsType);
const Song* pSong = GAMESTATE->m_pCurSong;
m_Timing = GAMESTATE->m_pCurSteps[pn]->GetTimingData();
// Generate some cache data structure.
GenerateCacheDataStructure(m_pPlayerState, m_NoteData);
@@ -691,7 +691,7 @@ void Player::Load()
// workaround, but since only DDR has ever really implemented those
// modes, it's stayed like this. -aj
StepsType st = GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)->m_StepsType;
NoteDataUtil::TransformNoteData( m_NoteData, m_pPlayerState->m_PlayerOptions.GetStage(), st );
NoteDataUtil::TransformNoteData(m_NoteData, *m_Timing, m_pPlayerState->m_PlayerOptions.GetStage(), st);
if (BATTLE_RAVE_MIRROR)
{
@@ -1504,7 +1504,7 @@ void Player::ApplyWaitingTransforms()
// if re-adding noteskin changes, this is one place to edit -aj
NoteDataUtil::TransformNoteData( m_NoteData, po, GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)->m_StepsType, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) );
NoteDataUtil::TransformNoteData(m_NoteData, *m_Timing, po, GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)->m_StepsType, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat));
}
m_pPlayerState->m_ModsToApply.clear();
}