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

Merge pull request #828 from mattmccutchen/submit/global-offset-and-rate

Browse Source 
Fix interaction between global offset and music rate.
This commit is contained in:
Kyzentun
2015-10-04 18:30:30 -06:00
parent 67a52139f7 343bbd0e56
commit 66c4f8f411
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+4 -2
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "TimingData.h"
#include "PrefsManager.h"
#include "GameState.h"
#include "RageUtil.h"
#include "RageLog.h"
#include "ThemeManager.h"
@@ -704,7 +705,7 @@ bool TimingData::DoesLabelExist( const RString& sLabel ) const
void TimingData::GetBeatAndBPSFromElapsedTime(GetBeatArgs& args) const
{
args.elapsed_time += PREFSMAN->m_fGlobalOffsetSeconds;
args.elapsed_time += GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate * PREFSMAN->m_fGlobalOffsetSeconds;
GetBeatAndBPSFromElapsedTimeNoOffset(args);
}
@@ -945,7 +946,8 @@ float TimingData::GetElapsedTimeInternal(GetBeatStarts& start, float beat,
float TimingData::GetElapsedTimeFromBeat( float fBeat ) const
{
return TimingData::GetElapsedTimeFromBeatNoOffset( fBeat ) - PREFSMAN->m_fGlobalOffsetSeconds;
return TimingData::GetElapsedTimeFromBeatNoOffset( fBeat )
- GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate * PREFSMAN->m_fGlobalOffsetSeconds;
}
float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const