From 059ae3868f5576c511e590d9911f848f39984663 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 7 Jun 2008 01:12:39 +0000 Subject: [PATCH] move NoteUpcoming message playing into ReceptorArrow --- stepmania/src/ReceptorArrow.cpp | 5 +++++ stepmania/src/ReceptorArrow.h | 1 + stepmania/src/ReceptorArrowRow.cpp | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp index 3d4710a0f2..87e260fa08 100644 --- a/stepmania/src/ReceptorArrow.cpp +++ b/stepmania/src/ReceptorArrow.cpp @@ -61,6 +61,11 @@ void ReceptorArrow::Step( TapNoteScore score ) m_pReceptor->PlayCommand( Capitalize(sJudge) ); } +void ReceptorArrow::SetNoteUpcoming( bool b ) +{ + m_pReceptor->PlayCommand( b ? "ShowNoteUpcoming" : "HideNoteUpcoming" ); +} + /* * (c) 2001-2004 Ben Nordstrom, Chris Danford * All rights reserved. diff --git a/stepmania/src/ReceptorArrow.h b/stepmania/src/ReceptorArrow.h index ffb8e5f4a5..2539c2480f 100644 --- a/stepmania/src/ReceptorArrow.h +++ b/stepmania/src/ReceptorArrow.h @@ -20,6 +20,7 @@ public: virtual void Update( float fDeltaTime ); void Step( TapNoteScore score ); void SetPressed() { m_bIsPressed = true; }; + void SetNoteUpcoming( bool b ); private: const PlayerState* m_pPlayerState; diff --git a/stepmania/src/ReceptorArrowRow.cpp b/stepmania/src/ReceptorArrowRow.cpp index fd6bddc8ca..b39da66732 100644 --- a/stepmania/src/ReceptorArrowRow.cpp +++ b/stepmania/src/ReceptorArrowRow.cpp @@ -96,7 +96,8 @@ void ReceptorArrowRow::SetPressed( int iCol ) void ReceptorArrowRow::SetNoteUpcoming( int iCol, bool b ) { - m_ReceptorArrow[iCol]->PlayCommand(b?"ShowNoteUpcoming":"HideNoteUpcoming"); + ASSERT( iCol >= 0 && iCol < (int) m_ReceptorArrow.size() ); + m_ReceptorArrow[iCol]->SetNoteUpcoming(b); }