From 0895f07f48e7fefb27eafa29016f8ded0c6c7d10 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 13 Oct 2005 22:48:22 +0000 Subject: [PATCH] simplify: StartTransitioningScreen calls TweenOffScreen --- stepmania/src/ScreenEvaluation.cpp | 6 +++--- stepmania/src/ScreenEvaluation.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index bc0629458e..16b50c559d 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -719,8 +719,10 @@ void ScreenEvaluation::Init() } -void ScreenEvaluation::TweenOursOffScreen() +void ScreenEvaluation::TweenOffScreen() { + ScreenWithMenuElements::TweenOffScreen(); + // large banner area OFF_COMMAND( m_LargeBanner ); OFF_COMMAND( m_sprLargeBannerFrame ); @@ -951,8 +953,6 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) void ScreenEvaluation::EndScreen() { - TweenOursOffScreen(); - FOREACH_PlayerNumber( p ) m_Grades[p].SettleImmediately(); diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 2573d227b8..bc569b3c42 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -47,7 +47,7 @@ public: virtual void Input( const InputEventPlus &input ); virtual void HandleScreenMessage( const ScreenMessage SM ); - virtual void TweenOursOffScreen(); + virtual void TweenOffScreen(); virtual void MenuBack( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn );