From e6bfc856b2b868b696d3e796c6ad4fb416dd4dd9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 13 Mar 2006 23:05:47 +0000 Subject: [PATCH] pull out standard ScreenPrompt::TweenOffScreen --- stepmania/src/ScreenPrompt.cpp | 14 ++++++++++---- stepmania/src/ScreenPrompt.h | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 912ccc32f3..54c6451741 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -206,10 +206,7 @@ void ScreenPrompt::End( bool bCancelled ) m_Out.StartTransitioning( SM_GoToNextScreen ); } - OFF_COMMAND( m_textQuestion ); - OFF_COMMAND( m_sprCursor ); - for( int i=0; i<=g_PromptType; i++ ) - OFF_COMMAND( m_textAnswer[i] ); + TweenOffScreen(); switch( m_Answer ) { @@ -233,6 +230,15 @@ void ScreenPrompt::PositionCursor() m_sprCursor->SetXY( bt.GetX(), bt.GetY() ); } +void ScreenPrompt::TweenOffScreen() +{ + OFF_COMMAND( m_textQuestion ); + OFF_COMMAND( m_sprCursor ); + for( int i=0; i<=g_PromptType; i++ ) + OFF_COMMAND( m_textAnswer[i] ); + + ScreenWithMenuElements::TweenOffScreen(); +} /* * (c) 2001-2004 Chris Danford diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h index bb09d2e185..afd66614a8 100644 --- a/stepmania/src/ScreenPrompt.h +++ b/stepmania/src/ScreenPrompt.h @@ -47,6 +47,8 @@ protected: virtual void End( bool bCancelled ); void PositionCursor(); + virtual void TweenOffScreen(); + BitmapText m_textQuestion; AutoActor m_sprCursor; BitmapText m_textAnswer[NUM_PROMPT_ANSWERS];