From f0e4bff570f1ab60f292d36add7557375df0b869 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 21 Jul 2005 01:04:54 +0000 Subject: [PATCH] avoid accessing m_PlayerStateEdit directly --- stepmania/src/ScreenEdit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 49af78fd53..f5c062a649 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -839,7 +839,7 @@ void ScreenEdit::Update( float fDeltaTime ) float fDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat; if( fabsf(fDelta) < 10 ) fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat, - fDeltaTime*40 / m_PlayerStateEdit.m_CurrentPlayerOptions.m_fScrollSpeed ); + fDeltaTime*40 / m_NoteFieldEdit.GetPlayerState()->m_CurrentPlayerOptions.m_fScrollSpeed ); else fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat, 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_DOWN: { - float& fScrollSpeed = m_PlayerStateEdit.m_PlayerOptions.m_fScrollSpeed; + PlayerState *pPlayerState = const_cast (m_NoteFieldEdit.GetPlayerState()); + float& fScrollSpeed = pPlayerState->m_PlayerOptions.m_fScrollSpeed; float fNewScrollSpeed = fScrollSpeed; if( EditB == EDIT_BUTTON_SCROLL_SPEED_DOWN )