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

avoid accessing m_PlayerStateEdit directly

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-21 01:04:54 +00:00
parent 7570946554
commit f0e4bff570
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+3 -2
View File
@@ -839,7 +839,7 @@ void ScreenEdit::Update( float fDeltaTime )
float fDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat; float fDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat;
if( fabsf(fDelta) < 10 ) if( fabsf(fDelta) < 10 )
fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat, fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat,
fDeltaTime*40 / m_PlayerStateEdit.m_CurrentPlayerOptions.m_fScrollSpeed ); fDeltaTime*40 / m_NoteFieldEdit.GetPlayerState()->m_CurrentPlayerOptions.m_fScrollSpeed );
else else
fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat, fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat,
fabsf(fDelta) * fDeltaTime*5 ); fabsf(fDelta) * fDeltaTime*5 );
@@ -1056,7 +1056,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
case EDIT_BUTTON_SCROLL_SPEED_UP: case EDIT_BUTTON_SCROLL_SPEED_UP:
case EDIT_BUTTON_SCROLL_SPEED_DOWN: case EDIT_BUTTON_SCROLL_SPEED_DOWN:
{ {
float& fScrollSpeed = m_PlayerStateEdit.m_PlayerOptions.m_fScrollSpeed; PlayerState *pPlayerState = const_cast<PlayerState *> (m_NoteFieldEdit.GetPlayerState());
float& fScrollSpeed = pPlayerState->m_PlayerOptions.m_fScrollSpeed;
float fNewScrollSpeed = fScrollSpeed; float fNewScrollSpeed = fScrollSpeed;
if( EditB == EDIT_BUTTON_SCROLL_SPEED_DOWN ) if( EditB == EDIT_BUTTON_SCROLL_SPEED_DOWN )