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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSyncOverlay.cpp
+8 -8
View File
@@ -86,7 +86,7 @@ void ScreenSyncOverlay::UpdateText()
FAIL_M(ssprintf("Invalid autosync type: %i", type));
}
if( GAMESTATE->m_pCurSong != NULL && !GAMESTATE->IsCourseMode() ) // sync controls available
if( GAMESTATE->m_pCurSong != nullptr && !GAMESTATE->IsCourseMode() ) // sync controls available
{
AdjustSync::GetSyncChangeTextGlobal( vs );
AdjustSync::GetSyncChangeTextSong( vs );
@@ -207,15 +207,15 @@ bool ScreenSyncOverlay::Input( const InputEventPlus &input )
}
default: break;
}
if( GAMESTATE->m_pCurSong != NULL )
if( GAMESTATE->m_pCurSong != nullptr )
{
TimingData &sTiming = GAMESTATE->m_pCurSong->m_SongTiming;
BPMSegment * seg = sTiming.GetBPMSegmentAtBeat( GAMESTATE->m_Position.m_fSongBeat );
seg->SetBPS( seg->GetBPS() + fDelta );
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s )
for (Steps *s : vpSteps)
{
TimingData &pTiming = (*s)->m_Timing;
TimingData &pTiming = s->m_Timing;
// Empty means it inherits song timing,
// which has already been updated.
if( pTiming.empty() )
@@ -259,17 +259,17 @@ bool ScreenSyncOverlay::Input( const InputEventPlus &input )
case ChangeSongOffset:
{
if( GAMESTATE->m_pCurSong != NULL )
if( GAMESTATE->m_pCurSong != nullptr )
{
GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds += fDelta;
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s )
for (Steps *s : vpSteps)
{
// Empty means it inherits song timing,
// which has already been updated.
if( (*s)->m_Timing.empty() )
if( s->m_Timing.empty() )
continue;
(*s)->m_Timing.m_fBeat0OffsetInSeconds += fDelta;
s->m_Timing.m_fBeat0OffsetInSeconds += fDelta;
}
}
break;