From aa34a3082dd7fd7c5b453cdf184375be3bc31f44 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 26 Feb 2007 03:24:38 +0000 Subject: [PATCH] remove OnCommand hacks --- stepmania/src/Transition.cpp | 15 --------------- stepmania/src/Transition.h | 1 - 2 files changed, 16 deletions(-) diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp index 496d5a4460..5f774fc02b 100644 --- a/stepmania/src/Transition.cpp +++ b/stepmania/src/Transition.cpp @@ -12,7 +12,6 @@ void Transition::Load( RString sBGAniDir ) this->RemoveAllChildren(); m_sprTransition.Load( sBGAniDir ); - m_sprTransition->PlayCommand( "On" ); this->AddChild( m_sprTransition ); m_State = waiting; @@ -41,10 +40,7 @@ void Transition::Reset() m_bFirstUpdate = true; if( m_sprTransition.IsLoaded() ) - { m_sprTransition->FinishTweening(); - m_sprTransition->PlayCommand( "On" ); - } } bool Transition::EarlyAbortDraw() const @@ -52,17 +48,6 @@ bool Transition::EarlyAbortDraw() const return m_State == waiting; } -/* Our parent might send us OnCommand. We do that ourself, because - * we sometimes want to know GetLengthSeconds before StartTransitioning. - * Make sure we don't process OnCommand twice. */ -void Transition::HandleMessage( const Message &msg ) -{ - if( msg.GetName() == "On" ) - return; - - ActorFrame::HandleMessage( msg ); -} - void Transition::StartTransitioning( ScreenMessage send_when_done ) { if( m_State != waiting ) diff --git a/stepmania/src/Transition.h b/stepmania/src/Transition.h index 2c288a9aa6..d53a217e03 100644 --- a/stepmania/src/Transition.h +++ b/stepmania/src/Transition.h @@ -16,7 +16,6 @@ public: void Load( RString sBGAniDir ); virtual void UpdateInternal( float fDeltaTime ); - virtual void HandleMessage( const Message &msg ); virtual void StartTransitioning( ScreenMessage send_when_done = SM_None ); virtual bool EarlyAbortDraw() const;