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

Most issues fixed for MMods.

Browse Source 
Present problem: trying to assign the scroll
speed in a "read only structure". Is mPlayerOptions.GetCurrent()
a set in disguise?
This commit is contained in:
Jason Felds
2011-07-03 10:26:00 -04:00
parent 07a2bd6da7
commit b15322a87a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+6 -5
View File
@@ -404,7 +404,7 @@ void Player::Init(
/* /*
// calculate M-mod speed here, so we can adjust properly on a per-song basis. // calculate M-mod speed here, so we can adjust properly on a per-song basis.
// XXX: can we find a better location for this? // XXX: can we find a better location for this?
if( m_pPlayerState->m_PlayerOptions.m_fMaxScrollBPM != 0 ) if( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM != 0 )
{ {
DisplayBpms bpms; DisplayBpms bpms;
@@ -440,21 +440,22 @@ void Player::Init(
FOREACH_CONST( TrailEntry, GAMESTATE->m_pCurTrail[pn]->m_vEntries, e ) FOREACH_CONST( TrailEntry, GAMESTATE->m_pCurTrail[pn]->m_vEntries, e )
{ {
float fMaxForEntry; float fMaxForEntry;
e->pSong->m_Timing.GetActualBPM( fThrowAway, fMaxForEntry ); e->pSong->m_SongTiming.GetActualBPM( fThrowAway, fMaxForEntry );
fMaxBPM = max( fMaxForEntry, fMaxBPM ); fMaxBPM = max( fMaxForEntry, fMaxBPM );
} }
} }
else else
{ {
GAMESTATE->m_pCurSong->m_Timing.GetActualBPM( fThrowAway, fMaxBPM ); GAMESTATE->m_pCurSong->m_SongTiming.GetActualBPM( fThrowAway, fMaxBPM );
} }
} }
ASSERT( fMaxBPM > 0 ); ASSERT( fMaxBPM > 0 );
// set an X-mod equal to Mnum / fMaxBPM (e.g. M600 with 150 becomes 4x) // set an X-mod equal to Mnum / fMaxBPM (e.g. M600 with 150 becomes 4x)
m_pPlayerState->m_StoredPlayerOptions.m_fScrollSpeed =
( m_pPlayerState->m_StoredPlayerOptions.m_fMaxScrollBPM / fMaxBPM ); m_pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollSpeed =
( m_pPlayerState->m_PlayerOptions.GetPreferred().m_fMaxScrollBPM / fMaxBPM );
} }
*/ */