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

Merge pull request #156 from sigatrev/Player/Notefield

Browse Source 
Stop player from updating NoteField twice
This commit is contained in:
Colby Klein
2014-05-05 19:51:22 -07:00
parent 7fffebd85f bfbbd27485
commit 612a3d1f73
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+1 -4
View File
@@ -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 );