From bfbbd2748532e5844e23de0c28c5378402568ad6 Mon Sep 17 00:00:00 2001 From: sigatrev Date: Mon, 5 May 2014 18:18:05 -0500 Subject: [PATCH] Stop player from updating NoteField twice Player was updating notefield in ActorFrame::Update and again in m_pNoteField->Update. This should handle it better. --- src/Player.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Player.cpp b/src/Player.cpp index 250446001a..68602e4e79 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -249,7 +249,6 @@ Player::Player( NoteData &nd, bool bVisibleParts ) : m_NoteData(nd) { m_pNoteField = new NoteField; m_pNoteField->SetName( "NoteField" ); - this->AddChild( m_pNoteField ); } m_pJudgedRows = new JudgedRows; @@ -523,6 +522,7 @@ void Player::Init( { m_pNoteField->Init( m_pPlayerState, m_fNoteFieldHeight ); ActorUtil::LoadAllCommands( *m_pNoteField, sType ); + this->AddChild( m_pNoteField ); } m_vbFretIsDown.resize( GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer ); @@ -856,9 +856,6 @@ void Player::Update( float fDeltaTime ) m_soundAttackEnding.Play(); } - if( m_pNoteField ) - m_pNoteField->Update( fDeltaTime ); - float fMiniPercent = m_pPlayerState->m_PlayerOptions.GetCurrent().m_fEffects[PlayerOptions::EFFECT_MINI]; float fTinyPercent = m_pPlayerState->m_PlayerOptions.GetCurrent().m_fEffects[PlayerOptions::EFFECT_TINY]; float fJudgmentZoom = min( powf(0.5f, fMiniPercent+fTinyPercent), 1.0f );