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

[splittiming] Right idea, wrong place.

Browse Source 
Song Timing respected when needed, included SpeedSegments.
This commit is contained in:
Jason Felds
2011-05-17 14:16:58 -04:00
parent 1a41c32dd9
commit c26da983e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ArrowEffects.cpp
+3 -3
View File
@@ -85,7 +85,7 @@ void ArrowEffects::Update()
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
const Style::ColumnInfo* pCols = pStyle->m_ColumnInfo[pn]; const Style::ColumnInfo* pCols = pStyle->m_ColumnInfo[pn];
const SongPosition &position = (GAMESTATE->m_bInStepEditor || GAMESTATE->m_bIsUsingStepTiming) const SongPosition &position = GAMESTATE->m_bIsUsingStepTiming
? GAMESTATE->m_pPlayerState[pn]->m_Position : GAMESTATE->m_Position; ? GAMESTATE->m_pPlayerState[pn]->m_Position : GAMESTATE->m_Position;
PerPlayerData &data = g_EffectData[pn]; PerPlayerData &data = g_EffectData[pn];
@@ -264,7 +264,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
bIsPastPeakOut = true; bIsPastPeakOut = true;
float fYOffset = 0; float fYOffset = 0;
const SongPosition &position = (!GAMESTATE->m_bInStepEditor || GAMESTATE->m_bIsUsingStepTiming) const SongPosition &position = GAMESTATE->m_bIsUsingStepTiming
? pPlayerState->m_Position : GAMESTATE->m_Position; ? pPlayerState->m_Position : GAMESTATE->m_Position;
float fSongBeat = position.m_fSongBeatVisible; float fSongBeat = position.m_fSongBeatVisible;
@@ -277,7 +277,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
{ {
float fBeatsUntilStep = fNoteBeat - fSongBeat; float fBeatsUntilStep = fNoteBeat - fSongBeat;
float fYOffsetBeatSpacing = fBeatsUntilStep; float fYOffsetBeatSpacing = fBeatsUntilStep;
float fSpeedMultiplier = GAMESTATE->m_bInStepEditor ? 1.0 : GetSpeedMultiplier( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible, pCurSteps->m_Timing ); float fSpeedMultiplier = ( GAMESTATE->m_bInStepEditor || !GAMESTATE->m_bIsUsingStepTiming ) ? 1.0 : GetSpeedMultiplier( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible, pCurSteps->m_Timing );
fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing);
} }