From 96cd668edc4a516d0a644a12017056b2d8a7d9e2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Oct 2005 02:37:04 +0000 Subject: [PATCH] remove KeypressBlock. Do this in the receptor. --- stepmania/src/ReceptorArrow.cpp | 23 ++++++++++------------- stepmania/src/ReceptorArrow.h | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp index 8cb124af9a..b23202e102 100644 --- a/stepmania/src/ReceptorArrow.cpp +++ b/stepmania/src/ReceptorArrow.cpp @@ -8,7 +8,6 @@ #include "Game.h" #include "PlayerState.h" -// eventually, these will replace the pressblocks const CString PRESS_COMMAND_NAME = "Press"; const CString LIFT_COMMAND_NAME = "Lift"; @@ -16,6 +15,7 @@ ReceptorArrow::ReceptorArrow() { m_bIsPressed = false; m_bWasPressed = false; + m_bWasReverse = false; } void ReceptorArrow::Load( const PlayerState* pPlayerState, int iColNo ) @@ -24,27 +24,24 @@ void ReceptorArrow::Load( const PlayerState* pPlayerState, int iColNo ) m_iColNo = iColNo; CString sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( iColNo ); - m_pReceptor.Load( NOTESKIN->GetPath(sButton,"receptor") ); - - m_pPressBlock.Load( NOTESKIN->GetPath(sButton,"KeypressBlock") ); - - m_pPressBlock->SetEffectClock( Actor::CLOCK_BGM_BEAT ); - - // draw pressblock before receptors - this->AddChild( m_pPressBlock ); this->AddChild( m_pReceptor ); + + bool bReverse = m_pPlayerState->m_PlayerOptions.GetReversePercentForColumn(m_iColNo) > 0.5f; + m_pReceptor->PlayCommand( bReverse? "ReverseOn":"ReverseOff" ); + m_bWasReverse = bReverse; } void ReceptorArrow::Update( float fDeltaTime ) { ActorFrame::Update( fDeltaTime ); - // update pressblock alignment based on scroll direction bool bReverse = m_pPlayerState->m_PlayerOptions.GetReversePercentForColumn(m_iColNo) > 0.5f; - m_pPressBlock->SetVertAlign( bReverse ? Actor::align_bottom : Actor::align_top ); - - m_pPressBlock->SetHidden( !m_bIsPressed ); + if( bReverse != m_bWasReverse ) + { + m_pReceptor->PlayCommand( bReverse? "ReverseOn":"ReverseOff" ); + m_bWasReverse = bReverse; + } } void ReceptorArrow::DrawPrimitives() diff --git a/stepmania/src/ReceptorArrow.h b/stepmania/src/ReceptorArrow.h index 1a774b8aba..ffb8e5f4a5 100644 --- a/stepmania/src/ReceptorArrow.h +++ b/stepmania/src/ReceptorArrow.h @@ -27,9 +27,9 @@ private: AutoActor m_pReceptor; - AutoActor m_pPressBlock; bool m_bIsPressed; bool m_bWasPressed; // set in Update + bool m_bWasReverse; }; #endif